Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Wed, 6 Aug 2014 16:35:59 +0000 (18:35 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Wed, 6 Aug 2014 16:35:59 +0000 (18:35 +0200)
commit252f6bf83073544ae8d46f107d33abd3959e2c41
treea4c9cf285ab0c43c0b7fd20d1e18bed04f754bb3
parente1c8c0ad3bb40bd1f4cffde333fca8f965b4ec77
parentb8c843b41416f41b21aaeb7ed262a35a2f9e20d7
Merge branch '2.0'