Fri, 15 Nov 2013 16:01:40 -0500 merge stable into default
Pierre-Yves David <pierre-yves.david@ens-lyon.org> [Fri, 15 Nov 2013 16:01:40 -0500] rev 746
merge stable into default
(0) -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip