Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 22 Aug 2013 09:49:21 +0000 (09:49 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 22 Aug 2013 09:49:21 +0000 (09:49 +0000)
commit4ee930e41dc7e0f64adfe7fd8a6988bcb7bce1ef
tree8f8f5bb497405824b6fe5754f9191dcd062b5ea9
parent1acd004e94b12cd4677265b5dc6aa55c48fe2af6
parent8b76ec5f7384be090b11e7178e47e7a58a3f1074
Merge branch 'master' into wosch