Merge branch 'master' into protocol-version2
authorDennis Schafroth <dennis@indexdata.com>
Wed, 25 Apr 2012 13:54:46 +0000 (13:54 +0000)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 25 Apr 2012 13:54:46 +0000 (13:54 +0000)

Trivial merge