Merge branch 'master' into accords
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 11 Apr 2012 09:16:40 +0000 (09:16 +0000)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Wed, 11 Apr 2012 09:16:40 +0000 (09:16 +0000)
commit0d3f1c4e0256a716913c52f6b149a780f62a0448
tree5dab1b31a59c65f6907335370e5f80688b1c915f
parent26b56802826d416671f64e492d99224126099fc1
parent55327aa74709cbff41df21319f99b831d990cc2b
Merge branch 'master' into accords

Conflicts:
setup.py
component/automake/buildout.cfg
setup.py