Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 16:33:47 +0000 (16:33 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 10 Jul 2014 16:33:47 +0000 (16:33 +0000)
commitf1457a890d9d686a6a4acd04c81ed8a732a73a75
treeb1d91dbe88472f58ffa903f0775a79ced21f1cbb
parentfd43004e29d575552d45f7285085028f6be6fa1b
parente0c9d74b0e4b5b6cf693ecf8298203290b43e9b5
Merge remote branch 'origin/master' into wosch