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

[Akira TAGOH]

commit 78d2e9745cc95c69c72ababee7848817473dc36e
Merge: 25616a9 ce81bf1
Author: Akira TAGOH <tagoh at redhat.com>
Date:   Wed Jun 25 21:49:49 2014 +0900

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

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