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

[Daiki Ueno]

commit 70de5c02c6ec1b09e4ec091028177a49c6e41b44
Merge: c5afb47 a5df21e
Author: Daiki Ueno <dueno at redhat.com>
Date:   Wed Dec 31 11:51:36 2014 +0900

    Merge branch 'master' into f21

 gettext.spec |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---