Merge branch 'master' into occi
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 5 Mar 2012 11:56:29 +0000 (12:56 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 5 Mar 2012 11:56:29 +0000 (12:56 +0100)
commitf4f72d6b8d1122fb2361590123e2845b5b196647
tree0c6d48015143a75c7c9f5053ef6fb85215fed848
parentd2562e4b2144b701000425e7c54720662e0d4cdc
parentc7d16ba52fbd56815f181ca3853f304dae18be8b
Merge branch 'master' into occi
setup.py