[translate-toolkit: 16/16] Merge remote branch 'origin/f12/master'

[dwayne]

commit 593867be0b7063e191827463444215688269277b
Merge: a81da4d 81742d0
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Wed Aug 18 08:04:11 2010 +0200

    Merge remote branch 'origin/f12/master'
    
    Conflicts:
    	.gitignore
    	sources
    	translate-toolkit.spec

 translate-toolkit.spec |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)
---
diff --cc translate-toolkit.spec
index cda2121,402b593..8f81f1c
--- a/translate-toolkit.spec
+++ b/translate-toolkit.spec
@@@ -185,11 -169,12 +185,15 @@@ rm -rf $RPM_BUILD_ROO
     - A better XML placeable with support for XML namespaces
     - A small bug with a single space unit as seen in abrt (bug 1370). This
       also fixes the resulting error in Virtaal.
+ - Drop patch for bug 1372
+ 
+ * Mon Feb 22 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.5.3-2
+ - Bug #1372: Decode fulesystem paths correctly
  
 -* Thu Feb 4 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.5.3-1
 +* Fri Feb 19 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.5.3-2
 +- Use python2-devel in BuildRequires
 +
 +* Tue Feb 2 2010 Dwayne Bailey <dwayne at translate.org.za> - 1.5.3-1
  - Update to 1.5.3
     - Plural information for more languages
     - Cleaner language names (for the benefit of Pootle and Virtaal)