Merge branch 'master' of git://repo.or.cz/wortliste
commit70aedb05ef92035d05cf516020c2d9687b7311aa
authorGuenter Milde <milde@users.sf.net>
Thu, 10 May 2012 22:23:26 +0000 (11 00:23 +0200)
committerGuenter Milde <milde@users.sf.net>
Thu, 10 May 2012 22:23:26 +0000 (11 00:23 +0200)
tree34ae002cb7de53a6c96094926509c90dee11d53d
parentc7c0f1fbd0a5ad886a9fffa88bf4cc32fcaa1b86
parent38b04345c59b6369709845675b467a5ac038976c
Merge branch 'master' of git://repo.or.cz/wortliste