[gyp/el5: 2/2] Merge remote-tracking branch 'origin/el6' into el5

[Akira TAGOH]

commit 9286e802797149239da3092d5b7f25e1c443451d
Merge: cdaac97 25dff72
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Jun 25 21:16:16 2014 +0900

    Merge remote-tracking branch 'origin/el6' into el5

 gyp.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---