Merge branch 'master' into new-upload

This commit is contained in:
Michael Snoyman 2014-12-27 18:36:34 +02:00
commit d42f6bbed4

View File

@ -399,6 +399,10 @@ packages:
- hPDB
- hPDB-examples
# https://github.com/fpco/stackage/pull/382#issuecomment-68182467
# - wordpass
# - json-autotype
"Roman Cheplyaka <roma@ro-che.info>":
- action-permutations
- amqp