]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #109 from inthepoche/dev
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 8 Aug 2013 16:36:10 +0000 (09:36 -0700)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Thu, 8 Aug 2013 16:36:10 +0000 (09:36 -0700)
merge dev into master


Trivial merge