commit 75a3f56f41fdbf6b3472c5c80e4fdbfa0b92d7e3 Merge: 7bf6e27 5a49987 Author: Dwayne Bailey <dwayne at translate.org.za> Date: Wed Aug 18 13:28:04 2010 +0200 Merge remote branch 'origin/f13/master' Conflicts: pootle.spec ---