Merge branch 'master' of ssh://git.indexdata.com:222/home/git/pub/git-tools
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 2 Jan 2013 12:18:10 +0000 (13:18 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 2 Jan 2013 12:18:10 +0000 (13:18 +0100)

Trivial merge