Merge branch 'master' into paz-732
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 14 Jun 2013 08:47:07 +0000 (10:47 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 14 Jun 2013 08:47:07 +0000 (10:47 +0200)
commitc14318db9e376a6e28c8dbe4b5cbf9d521827c24
treeb6f7f4974b90e7eebeb14b06f3506ae45b8bbd50
parent62370d1b03ab4460d54c81687ef650bda69e41d6
parent14f6131273597f2dce0a6635dd6d649341c72ee7
Merge branch 'master' into paz-732