[python-polib/el6: 7/7] Merge branch 'master' into el6

[Ding-Yi Chen]

commit 8d315822fe67c94c2141ff2ddc26c6d9fbafddff
Merge: aff24aa e3dd47b
Author: Ding-Yi Chen <dingyichen at gmail.com>
Date:   Tue Jul 16 16:59:17 2013 +1000

    Merge branch 'master' into el6

 .gitignore                     |    2 +
 polib-0.7.0_dbafdc621bf4.patch |  261 ----------------------------------------
 python-polib.spec              |   66 ++++++++++-
 sources                        |    2 +-
 4 files changed, 68 insertions(+), 263 deletions(-)
---