Merge remote-tracking branch 'origin/master' into iclass-fixes 17/head
authorMartin Holst Swende <martin@swende.se>
Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)
committerMartin Holst Swende <martin@swende.se>
Sat, 28 Jun 2014 10:47:40 +0000 (12:47 +0200)
commit6db28145eacac986d481ceadf7ee9fc1061555fd
tree9cecd6af1eb2b51f06825120b27881b274ba6f42
parent42f57e0294c13f14f8ebcdcc529b5872c2884786
parent238c503c3878a5d257051370a3895c166b018a49
Merge remote-tracking branch 'origin/master' into iclass-fixes
armsrc/apps.h
Impressum, Datenschutz