Merge branch 'master' of nomeata.haskell.org:gipeda
authorJoachim Breitner <mail@joachim-breitner.de>
Sat, 30 May 2015 12:08:53 +0000 (14:08 +0200)
committerJoachim Breitner <mail@joachim-breitner.de>
Sat, 30 May 2015 12:08:53 +0000 (14:08 +0200)
commit3a46218a392c4cdc1ed941ce4de732bf2cf02128
tree70c96dac654cbde01b6a4e57ffd97644b3ea348a
parent819d89eeb2609bc58828f9e58881828c46eafa6f
parent004d3cca2d3137097f61394b21d70d66f465d339
Merge branch 'master' of nomeata.haskell.org:gipeda