Merge tag 'v0.4.11'
authorDennis Schafroth <dennis@indexdata.com>
Tue, 20 Aug 2013 14:11:20 +0000 (16:11 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 20 Aug 2013 14:11:20 +0000 (16:11 +0200)

Trivial merge