[Pkg-javascript-commits] [less.js] 33/285: Merge remote-tracking branch 'origin/master' into 2_0_0

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag v2.0.0
in repository less.js.

commit 08490fd523d87679c7bca854b52cc54d92957924
Merge: a8ded64 e1f3d44
Author: Luke Page <luke.a.page at gmail.com>
Date:   Sun Mar 2 09:51:44 2014 +0000

    Merge remote-tracking branch 'origin/master' into 2_0_0
    
    Conflicts:
    	Gruntfile.js

 Gruntfile.js | 18 +++++++++---------
 README.md    |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/less.js.git