Merge branch 'master' into protocol-version2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 23 May 2012 11:10:42 +0000 (13:10 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 23 May 2012 11:10:42 +0000 (13:10 +0200)

Trivial merge