From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 25 Aug 2009 14:22:54 +0000 (+0200)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/1fc8724242d7f5bbba51812a118d86aead57f32b?ds=sidebyside;hp=1fc8724242d7f5bbba51812a118d86aead57f32b

Merge branch 'master' of git@stigma:platforma

Conflicts:

	project/static/js/jquery.logging.js
---