Merge remote branch 'origin/develop' into armv7
authorwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:18:40 +0000 (18:18 +0100)
committerwernsaar <wernsaar@googlemail.com>
Sun, 1 Dec 2013 17:18:40 +0000 (18:18 +0100)
commit402d6e91dbda558334c4158ef339b036832b7898
tree3f3f2f9b8e191216554c6776023fdc57284d40b8
parent9e38dbb658f71b393411c5189260a4d5a22ed7db
parentb3254eecafe8a0dd69db158a8451fb8200e0c48b
Merge remote branch 'origin/develop' into armv7