Merge branch 'master' into bug_4688
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:15:35 +0000 (12:15 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 8 Nov 2011 11:15:35 +0000 (12:15 +0100)
commitfba15c69a3a51b91b1d4b2238991c91852b55639
treecfd9c77d5901da6c3f8e4bb4b4af47df4a0dec91
parenta76aa7a25380bb9947d8dfed2aca94832f47d564
parent873be84689528ca10a1ded3dd4bbda24b6916882
Merge branch 'master' into bug_4688