Merge branch 'master' into lqc-trunk
[redakcja.git] / apps / sorl / thumbnail / __init__.py