[nodejs-less/el6: 4/4] Merge branch 'master' into el6

[Stephen Gallagher]

commit a17c3ea0ec1221a8aab25b58c7ca3069b8bf0452
Merge: 76514bf 9102456
Author: Stephen Gallagher <sgallagh at redhat.com>
Date:   Tue Jun 18 16:51:23 2013 -0400

    Merge branch 'master' into el6

 .gitignore                                         |    1 +
 ...e-include-files-from-the-default-location.patch |   18 +++---
 nodejs-less.spec                                   |   55 ++++++++++++++++++-
 sources                                            |    2 +-
 4 files changed, 63 insertions(+), 13 deletions(-)
---