Merge branch 'devel'
authorRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 16:06:54 +0000 (18:06 +0200)
committerRalf Ertzinger <ralf@skytale.net>
Sat, 29 Jun 2013 16:06:54 +0000 (18:06 +0200)

Trivial merge