Revision a802e91b27885038fde86ef858aae74757954f9e

Committed on 13/03/2013 5:56 am by Arnaud Lafon <arnaud.lafon@gmail.com> [GitHub Diff]

0.4.8 / conflict resolved