Merge remote-tracking branch 'origin/master' into ranking-h
authorHeikki Levanto <heikki@indexdata.dk>
Wed, 4 Dec 2013 14:42:14 +0000 (15:42 +0100)
committerHeikki Levanto <heikki@indexdata.dk>
Wed, 4 Dec 2013 14:42:14 +0000 (15:42 +0100)

Trivial merge