Merge remote branch 'origin/armv7' into develop
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:19:58 +0000 (18:19 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:19:58 +0000 (18:19 +0100)
commita74ac849819fd394ed556f6d2b6587620bec1125
tree3f3f2f9b8e191216554c6776023fdc57284d40b8
parent6d2c6b5c74c86f7d71598a3128f3415e8f514cc9
parent402d6e91dbda558334c4158ef339b036832b7898
Merge remote branch 'origin/armv7' into develop