merge stable back into default
authorPierre-Yves David <pierre-yves.david@logilab.fr>
Fri, 14 Jun 2013 17:13:17 +0200
changeset 9014 dfa4da8a53a0
parent 9010 1f3d4d829e63 (diff)
parent 9013 b4bcabf55e77 (current diff)
child 9015 65b8236e1bb4
merge stable back into default