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

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

4c68c20cdd2baec36c03aa6237d2d932605b6252