[Pkg-javascript-commits] [backbone] 103/211: Merge branch 'gh-pages'

[Jonas Smedegaard]

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

js pushed a commit to tag 0.5.0
in repository backbone.

commit 1028e63f7b0ad96fea04de54ad4d4d12f3eca0df
Merge: 67d61fc 35ba4a9
Author: Samuel Clay <samuel at ofbrooklyn.com>
Date:   Wed Mar 23 14:12:49 2011 -0400

    Merge branch 'gh-pages'
    
    Conflicts:
    	index.html

 docs/images/flow.png       | Bin 0 -> 155078 bytes
 docs/images/soundcloud.png | Bin 0 -> 131782 bytes
 index.html                 |  91 ++++++++++++++++++++++++++++++++-------------
 3 files changed, 65 insertions(+), 26 deletions(-)


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