Fixes merge error
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:47:10 +0000 (16:47 -0400)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Thu, 27 Jun 2013 20:47:10 +0000 (16:47 -0400)

No differences found