Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 09:23:31 +0000 (09:23 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Tue, 29 Apr 2014 09:23:31 +0000 (09:23 +0000)
commit879ac5e92cfb287ff4e0126ed1e9b5abaf0ff077
tree5556ee22fd82014b00824c2dc7d0191211f7e05e
parent0807a57fe38e3b78fcbc4b8649d4672777a2633c
parentd90b9e647506a25962cf8cd4c601c29c9f18ba01
Merge remote branch 'origin/master' into wosch