Merge branch 'master' into wosch
authorWolfram Schneider <wosch@indexdata.dk>
Fri, 16 Aug 2013 11:17:59 +0000 (11:17 +0000)
committerWolfram Schneider <wosch@indexdata.dk>
Fri, 16 Aug 2013 11:17:59 +0000 (11:17 +0000)
commit1615753a237430ea336c5b97d25eed482ae04f65
treefa19f1cd068d9871ca0624dea77a2d8874fce9d6
parent0f039bb934f75ea359641f2cdd8be482d0dc1689
parente414a230b3ae7855fe0d36449e0e6372bb06fcb8
Merge branch 'master' into wosch