Merge pull request #581 from wernsaar/develop
authorwernsaar <wernsaar@googlemail.com>
Sat, 23 May 2015 10:58:15 +0000 (12:58 +0200)
committerwernsaar <wernsaar@googlemail.com>
Sat, 23 May 2015 10:58:15 +0000 (12:58 +0200)
bugfix for arm locking


Trivial merge