Merge branch 'master' into paz-927
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:26:17 +0000 (11:26 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 6 Mar 2015 10:26:17 +0000 (11:26 +0100)
commita5c3dee6eb34da90683db5ac0b0e4e876627496b
tree0364b0a8b6a28ba850d5fa08d98cda93dd2b8a85
parent3727a2120dbd3c0e7b981efffa1572c7bbd8859a
parentf2db9c3965cc836568198e832908c3e2d62dd8cd
Merge branch 'master' into paz-927