projects / mirror / dsa-puppet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: daf71c6 be0dcbc)
Merge remote branch 'ganneff/master'
authorPeter Palfrader <peter@palfrader.org>
Thu, 17 Feb 2011 10:11:12 +0000 (11:11 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 17 Feb 2011 10:11:12 +0000 (11:11 +0100)
* ganneff/master:
  ries no ftphost, put morricone into it (has backports). also allow archvsync runmirrors on SECHOSTS for dak

Signed-off-by: Peter Palfrader <peter@palfrader.org>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.