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

[T.C. Hollingsworth]

commit 45f22b0f4916d21392d46fb408b43b5ed41a89d0
Merge: 8e96336 86f3e4a
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Sep 24 04:34:04 2014 -0700

    Merge branch 'master' into el6

 nodejs-qs.spec |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
---