From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 12:18:04 +0000 (+0200)
Subject: Merge remote-tracking branch 'virtualtam/travis' into next
X-Git-Tag: v0.5.0~39
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=7d338fa5315a9de59cfff924114ec73e62380466

Merge remote-tracking branch 'virtualtam/travis' into next
---

7d338fa5315a9de59cfff924114ec73e62380466