]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #132 from inthepoche/dev 140/head
authorNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 12 Aug 2013 12:14:04 +0000 (05:14 -0700)
committerNicolas Lœuillet <nicolas.loeuillet@gmail.com>
Mon, 12 Aug 2013 12:14:04 +0000 (05:14 -0700)
merge with beta2


Trivial merge