Merge branch 'master' into normal_cql
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Mar 2013 14:44:50 +0000 (15:44 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 13 Mar 2013 14:44:50 +0000 (15:44 +0100)

Trivial merge