From: Sem <sembrestels@riseup.net>
Date: Sun, 29 Jul 2012 02:49:57 +0000 (+0200)
Subject: Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f900e1e3cd0384aade0594ceffb6e4f51ce71415;p=lorea%2Felgg.git

Merge branch 'no-watermark' of git://github.com/sembrestels/Tidypics
---

f900e1e3cd0384aade0594ceffb6e4f51ce71415