[Pkg-javascript-commits] [backbone] 19/74: resolve conflict

[Jonas Smedegaard]

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

js pushed a commit to tag 0.3.0
in repository backbone.

commit 806a51b33c491b7868a12c089ca71e1568ad1a63
Merge: 0ddef3b 0f1e84f
Author: Jeremy Ashkenas <jashkenas at gmail.com>
Date:   Mon Oct 25 17:39:41 2010 -0400

    resolve conflict


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