[gnome-subtitles: 13/13] Merge remote branch 'origin/f12/master'

[belegdol]

commit b001513208b0b6c6abd5f53fbcd446992e6ec692
Merge: bbe9068 c253b62
Author: Julian Sikorski <belegdol at gmail.com>
Date:   Thu Aug 5 00:20:25 2010 +0200

    Merge remote branch 'origin/f12/master'

---