From: Franck Villaume <franck.villaume@trivialdev.com>
Date: Mon, 24 Jun 2013 21:13:35 +0000 (+0200)
Subject: Merge remote-tracking branch 'nerville/master'
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=c168d5246696d2ed41cbff4ab44c876a02e0b3b8

Merge remote-tracking branch 'nerville/master'
---

c168d5246696d2ed41cbff4ab44c876a02e0b3b8