]> git.deb.at Git - deb/packages.git/commitdiff
projects / deb / packages.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 49b3b99 9cb52a2)
Merge branch 'master' into debian-master
authorSimon Paillard <spaillard@debian.org>
Sat, 27 Aug 2011 20:42:07 +0000 (22:42 +0200)
committerSimon Paillard <spaillard@debian.org>
Sat, 27 Aug 2011 20:42:07 +0000 (22:42 +0200)
1  2 
templates/config/mirrors.tmpl patch | diff1 | diff2 | blob | history

diff --cc templates/config/mirrors.tmpl
Simple merge