From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 13:03:01 +0000 (+0200)
Subject: Merge remote-tracking branch 'nicolasdanelon/master' into next
X-Git-Tag: v0.5.0~35
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62;hp=adb1d6c213e64f7a6f4559adbc4d1f69f5a74e62;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'nicolasdanelon/master' into next
---