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

[tdawson]

commit 636af78897c381ee77f643f0b0f81b66ccd0dd09
Merge: 0bb51a0 6abbddb
Author: Troy Dawson <tdawson at redhat.com>
Date:   Wed Jun 5 09:40:56 2013 -0500

    Merge branch 'master' into el6

 nodejs-ws.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---