diff options
author | Andrew Manison <amanison@anselsystems.com> | 2011-12-11 17:07:13 +0000 |
---|---|---|
committer | Andrew Manison <amanison@anselsystems.com> | 2011-12-11 17:07:13 +0000 |
commit | b837d3fe7b2ded5ced7389896a5faf15b12ba685 (patch) | |
tree | 178186fdfdc973dcf43a77975324f2d6340db69a /main/rdiff-backup | |
parent | 67af8a7a0619619600d8b4af2f73a942de2f20df (diff) | |
parent | 0c5d733db74cad4285bc792567963c45a0b7ba2d (diff) | |
download | aports-b837d3fe7b2ded5ced7389896a5faf15b12ba685.tar.bz2 aports-b837d3fe7b2ded5ced7389896a5faf15b12ba685.tar.xz |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
acceptable-package-list.txt
Diffstat (limited to 'main/rdiff-backup')
0 files changed, 0 insertions, 0 deletions