Merge branch '2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 5 Oct 2014 08:20:13 +0000 (10:20 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 5 Oct 2014 08:20:13 +0000 (10:20 +0200)
commitcfd2852c673407b38dcf1dd04e87886916b55586
tree2404cac65293bbdd842c5a449f0e8b4fc99e6354
parenteb4d28070a9cd1453e314d856e1e550693c15ec4
parent55df565c722c3f084b8e453bc83891621ee03ac0
Merge branch '2.0'