Merge branch 'master' of nomeata.haskell.org:gipeda