Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sat, 26 Jul 2014 08:32:29 +0000 (10:32 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 26 Jul 2014 08:32:29 +0000 (10:32 +0200)
commit061c3b2e201c721ea83c3c92d7c941637f6b8a7d
tree4ec73bd7cea3ca701b84ba39c539cfbfe85afb96
parent20ffcf44cd4d605fd7835c6530cafb9e5e6d58a8
parent6d2518a075c9cb005388006b30fc7c63f65816a6
Merge branch '2.0'