Merge branch 'master' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
commit6ae694db0d400136902e402079312353d92781be
tree93a0c9ccc52c60b96e305a011c2a524d2d0a9f55
parentc91fa0aa45b6a0b3a945a345d469b711459ae4b0
parent7e5b1513e55626aac1aff255c101017c69b9cf85
Merge branch 'master' into develop