projects / gipeda.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 819d89e 004d3cc)
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)

Trivial merge