Merge branch 'develop' into linux_joystick
authorStefanos A <stapostol@gmail.com>
Tue, 14 Jan 2014 17:26:05 +0000 (18:26 +0100)
committerStefanos A <stapostol@gmail.com>
Tue, 14 Jan 2014 17:26:05 +0000 (18:26 +0100)

Trivial merge