Merge branch 'develop' into introduce-travis-ci
authorThomas Müller <thomas.mueller@tmit.eu>
Thu, 13 Mar 2014 10:01:19 +0000 (11:01 +0100)
committerThomas Müller <thomas.mueller@tmit.eu>
Thu, 13 Mar 2014 10:01:19 +0000 (11:01 +0100)

Trivial merge