Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorDennis Schafroth <dennis@indexdata.com>
Wed, 28 Sep 2011 12:56:01 +0000 (14:56 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Wed, 28 Sep 2011 12:56:01 +0000 (14:56 +0200)

Trivial merge