Merge branch 'wl-locale-merge' into locale_new
authorMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 4 Apr 2012 11:43:18 +0000 (13:43 +0200)
committerMarcin Koziej <marcin.koziej@nowoczesnapolska.org.pl>
Wed, 4 Apr 2012 11:43:18 +0000 (13:43 +0200)

Trivial merge