Merge branch 'sunburnt' of git+ssh://san.fnp/home/staging/dev/application into sunburnt
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 5 Sep 2012 12:51:56 +0000 (14:51 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 5 Sep 2012 12:51:56 +0000 (14:51 +0200)

Trivial merge