[pootle: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/pootle

[dwayne]

commit 0da13b939bdd0d0239ac4afcd4e22e065b7ebca1
Merge: 27f80ec 3280c43
Author: Dwayne Bailey <dwayne at translate.org.za>
Date:   Sat Apr 16 12:13:15 2011 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/pootle
    
    Conflicts:
    	pootle.spec

 pootle.spec |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
---
diff --cc pootle.spec
index db92be5,a921ac7..9563de9
--- a/pootle.spec
+++ b/pootle.spec
@@@ -129,19 -129,9 +129,22 @@@ f
  
  
  %changelog
 +* Sat Apr 16 2011 Dwayne Bailey <dwayne at translate.org.za> - 2.1.6-1
 +- Update to 2.1.6
 +- Ensure compatability with Django 1.2.5 and 1.3.0 (require Translate
 +  Toolkit >= 1.9.0)
 +- Other fixes:
 +  - Fixed another bug with GNU style projects language detection.
 +  - Added a separate project type for UTF-8 encoded Java properties.
 +  - Fixed a bug that would under rare conditions hide some strings from
 +    translate page.
 +  - Fixed a bug that caused some translation project level statistics
 +    to be miscalculated.
 +  - Fix for Qt TS format based on changes in Translate Toolkit 1.9.0
 +
+ * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.5-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 18 2011 Dwayne Bailey <dwayne at translate.org.za> - 2.1.5-1
  - Update to 2.1.5
     - Fix regression causing update from templates to fail for GNU Style