Merge remote-tracking branch 'origin/accords'
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 20 Aug 2014 09:14:02 +0000 (09:14 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 20 Aug 2014 09:14:02 +0000 (09:14 +0000)
commit77db41ff11f884f0c8bb6d046b150771bb583869
tree354409313d2d67ab2e80419a5d3179c64cdb01f2
parent47abcaaed1ca3c10773f4aa5cd9519ece0ad1508
parent93c88cb080bfca0619ee87953ad49173afa79275
Merge remote-tracking branch 'origin/accords'

Conflicts:
component/automake/buildout.cfg
component/ca-certificates/buildout.cfg
setup.py
setup.py