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

[Jamie Nguyen]

commit 6cbc5b53e1b11e1322a1ba9b7b7abd9dac8a40c4
Merge: b994844 7513212
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Sun Jul 28 22:19:59 2013 +0100

    Merge branch 'master' into f18

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