Merge remote-tracking branch 'pootle/master'
commita035ded0500e1d24dde151ab12929575114ec3fd
authorMichal Čihař <mcihar@suse.cz>
Mon, 24 Oct 2011 15:07:09 +0000 (24 17:07 +0200)
committerMichal Čihař <mcihar@suse.cz>
Mon, 24 Oct 2011 15:07:09 +0000 (24 17:07 +0200)
treeff8eae354284e306e23316ef1fca36966283c4a9
parentb02cdb9357982c3cd213880f1d2291516f6ac07a
parenta8be7022bb4e06d0dcc421620f2d13117a72951e
Merge remote-tracking branch 'pootle/master'

Conflicts:
po/pl.po
po/pl.po