Merge branch 'master' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 9 Oct 2015 13:33:33 +0000 (15:33 +0200)
commit9a84bed87398862850cf0554b50b20cea28a0951
tree3c7a1b02ca1441fe0b1d9ed2201076f480f4b6cf
parent45741193fdb5a6d3f31bf05345a4c28816408d0b
parent72c118d0b983148a53dc08e4d2733cf855cae863
Merge branch 'master' into develop