From: nodiscc <nodiscc@gmail.com>
Date: Fri, 22 May 2015 19:04:36 +0000 (+0200)
Subject: Merge remote-tracking branch 'Marsup/firefox-social' into next
X-Git-Tag: v0.5.0~43
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048;p=github%2Fshaarli%2FShaarli.git

Merge remote-tracking branch 'Marsup/firefox-social' into next
---

8b3c67fccbe7e68b304d3071b1f7a77e0f1fc048