Merge branch 'master' into sunburnt
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 10 Sep 2012 13:03:33 +0000 (15:03 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Mon, 10 Sep 2012 13:03:33 +0000 (15:03 +0200)
commitac6111b68183ba7da48252eb0f7389b24ede20a9
treeb179065f62b1f13a8a0e7603753ea9b97eeb44ca
parentd6c2be651d0cc889b1dbc5b73c7659a8a2ff7704
parent6835539fb69c791e27d536c8136a7ee199237754
Merge branch 'master' into sunburnt