]> ruderich.org/simon Gitweb - config/dotfiles.git/commit
Merge remote branch 'asp/master'
authorSimon Ruderich <simon@ruderich.org>
Fri, 3 Dec 2010 11:48:25 +0000 (12:48 +0100)
committerSimon Ruderich <simon@ruderich.org>
Fri, 3 Dec 2010 11:48:25 +0000 (12:48 +0100)
commitb7ff27cb60530eeebcfb9bdef1b68f548e1d88ed
treec08922984ec43f3e3f2cb5d523281c9f9b58814e
parent189b0e98a4ad0f1aafb061a2e3322e333c352102
parentf0603be5c23e9cb2f1e32b0fdcac15848943ff93
Merge remote branch 'asp/master'

Conflicts:
bin/git-update.sh
bin/git-update.sh