]> ruderich.org/simon Gitweb - config/dotfiles.git/commit
Merge commit 'rammstein/master'
authorSimon Ruderich <simon@ruderich.org>
Wed, 18 Feb 2009 20:03:43 +0000 (21:03 +0100)
committerSimon Ruderich <simon@ruderich.org>
Wed, 18 Feb 2009 20:03:43 +0000 (21:03 +0100)
commitd648243d7cce390e7321f2d45d42cdec25f295c7
tree42726ee2a5c9ee29d832070e86a97b175b89cf8a
parent27b94f650cd4d27bbf8bd9fc33030077a675d4d7
parent0ac6aa77b7b14c940a6b85f633326b57bc03f043
Merge commit 'rammstein/master'

Conflicts:

sync.sh
sync.sh