]> git.parisson.com Git - django-postman.git/commit
Merge remote-tracking branch 'hg/master' dev
authorGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Feb 2014 00:38:23 +0000 (01:38 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Thu, 13 Feb 2014 00:38:23 +0000 (01:38 +0100)
commit116cc75edabdfe83dd1df54f0d90e29687e7206b
tree5ffb2abc54ace6e14f9b30b2c633cea8443b5659
parent9d233828e5cf6c37673e6ac926054182fa151d82
parentfaad10487eecd1cf0b0cf8c57442a2a863655ba7
Merge remote-tracking branch 'hg/master'

Conflicts:
postman/tests.py
postman/models.py
postman/utils.py