Merge branch '0.19.x'
authorStefan Behnel <stb@skoobe.de>
Sun, 14 Jul 2013 11:49:35 +0000 (13:49 +0200)
committerStefan Behnel <stb@skoobe.de>
Sun, 14 Jul 2013 11:49:35 +0000 (13:49 +0200)

Trivial merge