[nodejs-qs/el6: 4/4] Merge branch 'master' into el6

[Jamie Nguyen]

commit 70206027e3ebd30a99d297fec279e1693879cf09
Merge: 745680f 7513212
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Jul 28 22:20:17 2013 +0100

    Merge branch 'master' into el6

 nodejs-qs.spec |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
---