Merge branch 'master' into yaz-781
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 18 Aug 2014 13:28:14 +0000 (15:28 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 18 Aug 2014 13:28:14 +0000 (15:28 +0200)
commitaf7df1eb703a867fe5d2226a13d4ea59aa0c87dc
tree4d8fd03689f21a33ccb9b1d4b54bb24ff453e33e
parentb1df5f9013d82510f6250d93623a0126ec19265f
parentc659f52fe4ee144502877f77cc0d6ff5125cc1cb
Merge branch 'master' into yaz-781