]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge branch 'dev' of https://github.com/nicofrand/poche into dev 154/head
authorNicolas Frandeboeuf <nicofrand@gmail.com>
Wed, 21 Aug 2013 22:57:11 +0000 (00:57 +0200)
committerNicolas Frandeboeuf <nicofrand@gmail.com>
Wed, 21 Aug 2013 22:57:11 +0000 (00:57 +0200)

Trivial merge