Merge branch 'MDL-24898_strip_and_trunc_subjects_wip' of git://github.com/stronk7...
authorPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 19:57:13 +0000 (20:57 +0100)
committerPetr Skoda <commits@skodak.org>
Mon, 14 Feb 2011 19:57:13 +0000 (20:57 +0100)

Trivial merge