Merge remote branch 'origin/master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Thu, 17 Apr 2014 12:25:29 +0000 (12:25 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Thu, 17 Apr 2014 12:25:29 +0000 (12:25 +0000)
commite0097bcc301d00adac87eabfa2f1bb6b4be25255
tree2afd56a919476785bc7c669ac26bdb85ad814d6e
parent841726a9de1a59357270f33148e37255aa2e4486
parentba0189852aeeeec2413baf4b6fab2f04086659a7
Merge remote branch 'origin/master' into wosch