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

[T.C. Hollingsworth]

commit 64e7730b38c331cd4e42f4559f8b003cb547ae25
Merge: 2e1fd78 86f3e4a
Author: T.C. Hollingsworth <tchollingsworth at gmail.com>
Date:   Wed Sep 24 04:34:01 2014 -0700

    Merge branch 'master' into f19

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