[nodejs-couch-login/f18: 5/5] Merge branch 'master' into el6

[Jamie Nguyen]

commit 23b245ebe459317df9dcb825e8d3d75f6cb115bd
Merge: 276feb9 be94076
Author: Jamie Nguyen <j at jamielinux.com>
Date:   Fri Sep 6 18:02:28 2013 +0100

    Merge branch 'master' into el6
    
    Conflicts:
    	.gitignore
    	nodejs-couch-login.spec
    	sources

 .gitignore              |    1 +
 nodejs-couch-login.spec |   20 ++++++++++++++++----
 sources                 |    3 +--
 3 files changed, 18 insertions(+), 6 deletions(-)
---