Merge branch 'master' of git://repo.or.cz/wortliste
commit1d90ca4ebab074f953db643ee05a70c5191c1291
authorGuenter Milde <milde@users.sf.net>
Fri, 24 Jan 2014 10:05:41 +0000 (24 11:05 +0100)
committerGuenter Milde <milde@users.sf.net>
Fri, 24 Jan 2014 10:05:41 +0000 (24 11:05 +0100)
tree6d6548f97cdda62c91571cafe7619c0c51ca28c5
parent3d22701d8056b06b02b68476f54edb687b2dabd0
parentdc4bf1a82eb789fa8eab4e71351e7b35994cb494
Merge branch 'master' of git://repo.or.cz/wortliste

Conflicts:
wortliste