Merge branch 'normal_cql'
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 3 Apr 2013 11:21:58 +0000 (13:21 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 3 Apr 2013 11:21:58 +0000 (13:21 +0200)

Trivial merge