Merge branch 'mass_edit'
authorMarcin Koziej <marcin@lolownia.org>
Mon, 21 May 2012 09:39:49 +0000 (11:39 +0200)
committerMarcin Koziej <marcin@lolownia.org>
Mon, 21 May 2012 09:39:49 +0000 (11:39 +0200)

Trivial merge