From: Nicolas Lœuillet <nicolas.loeuillet@gmail.com>
Date: Thu, 8 Aug 2013 16:36:10 +0000 (-0700)
Subject: Merge pull request #109 from inthepoche/dev
X-Git-Tag: 1.0-beta3~3
X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=9a8b4ff4edf84d7df60de1b6fd1e493b59f88273

Merge pull request #109 from inthepoche/dev

merge dev into master
---

9a8b4ff4edf84d7df60de1b6fd1e493b59f88273