From: nodiscc <nodiscc@gmail.com>
Date: Fri, 10 Apr 2015 18:28:24 +0000 (+0200)
Subject: Merge commit '326ae54' into next
X-Git-Tag: v0.5.0~50
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=1caf20055175d47e0c88785e185e15a481509368

Merge commit '326ae54' into next
---

1caf20055175d47e0c88785e185e15a481509368