-
Committer:
Bertrand Rousseau
-
Date:
2012-07-13 17:24:28 UTC
-
mfrom:
(1178.1.28 trunk)
-
mto:
(1178.1.30 trunk)
-
mto:
This revision was merged to the branch mainline in
revision
1183.
-
Revision ID:
bertrand.rousseau@gmail.com-20120713172428-ou3ic646fccov41d
Merge with trunk. Fixes conflict with CHANGELOG.