Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Tue, 2 Sep 2014 18:59:51 +0000 (20:59 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 2 Sep 2014 18:59:51 +0000 (20:59 +0200)
commit4e861fd00061ca9828f89739a73dce91bf6d3d4f
tree254d0c7ed06b967af5f44a5b71bc22b850cbb7b6
parent5f33869f467b15073a56d8f127dc58a916751b8f
parentce482ec4566c56b090ba549d791a479de2704ca7
Merge branch '2.0'