Merge branch 'refs/heads/2.0'
authorMatthias Schmidt <gravatronics@live.com>
Sun, 23 Mar 2014 18:22:12 +0000 (19:22 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Sun, 23 Mar 2014 18:22:12 +0000 (19:22 +0100)

Trivial merge