Merge branch 'master' into production
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 7 Sep 2012 13:37:35 +0000 (15:37 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Fri, 7 Sep 2012 13:37:35 +0000 (15:37 +0200)
commit86e0b03a81484dba7472e587d1499e63d151fa93
tree7823dd7acabd3949edf5af29807605076a295ba1
parent96502f6fbeeccc9cfdc89654203aab7fe2256da5
parentf3297edabcea6046315fe17012dfc7c82c108786
Merge branch 'master' into production