Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 14:54:42 +0000 (15:54 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 3 Nov 2011 14:54:42 +0000 (15:54 +0100)
commit67c51b2822602e8817c2c7468c112dd35c125405
treed657aab09496ab9f052e66e27d42e146f9eb8489
parent158c725b0201be796e73338f8c8b529379912ad6
parentb2ec338966bde1817c09a6789e74ddc5b075823b
Merge branch 'master' into bug_4688