[gettext/f21: 4/4] Merge branch 'master' into f21

[Daiki Ueno]

commit c5afb4767a588e2643ead9d83ca3ac78a424cce9
Merge: fb6f184 da13e38
Author: Daiki Ueno <dueno at redhat.com>
Date:   Fri Dec 26 18:01:56 2014 +0900

    Merge branch 'master' into f21

 .gitignore                          |   10 +--
 gettext-autopoint-infloop.patch     |   82 -----------------
 gettext-fix-octal-char-escape.patch |   14 ---
 gettext-ncurses-italic.patch        |  167 -----------------------------------
 gettext.spec                        |   40 ++++----
 sources                             |    2 +-
 6 files changed, 22 insertions(+), 293 deletions(-)
---