Merge branch 'master' of git.nomeata.de:gipeda
authorJoachim Breitner <mail@joachim-breitner.de>
Fri, 29 May 2015 20:27:32 +0000 (20:27 +0000)
committerJoachim Breitner <mail@joachim-breitner.de>
Fri, 29 May 2015 20:27:32 +0000 (20:27 +0000)
commit004d3cca2d3137097f61394b21d70d66f465d339
tree29e143c10dffd5b3ef9a99b9445dc4c36fa036f4
parent0a27d3d5aba8efa16d31b44c54a9cd7fd34d695f
parentb47262c91eec4ba91ef7158535b2d26a58c518b2
Merge branch 'master' of git.nomeata.de:gipeda
src/gipeda.hs