Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 12:00:25 +0000 (12:00 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 21 Jun 2013 12:00:25 +0000 (12:00 +0000)
commit8ce359b31240022b01ae733d6a1a0af25c5c8662
treec08637d60057a9d7316a773f5aef47c2ef0e6cd4
parent3bf6bcb8ee9b923acc06fff0e02f9b5e8978e56b
parent591893fc08fe464a0bd938ee93164a3f43b335d1
Merge branch 'master' into wosch