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)
commitc0b85157a9c44a6374e749984e8a55d45868998f
tree49488594327f35027f514d7fddbe2f21d00a95c8
parent2e03bef227eb35be7c2c1fc55e2739ded427769e
parentb2319515851fbe8b97dfb1b645555da6ae0de33e
Merge branch 'develop' into introduce-travis-ci