diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-28 16:34:58 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-28 16:34:58 -0400 |
| commit | 996e5eee01c83e6a95b51ac10ed5d2b39616d092 (patch) | |
| tree | be2ed7e52c1f48598f8851c40262d4555e2df3da /doc/special_remotes | |
| parent | a87822bbb29559919ef74bcc8cc29cca128831f5 (diff) | |
| parent | 3b2cbf21040d36c032f657c25ad2e85b90e1b380 (diff) | |
Merge branch 'master' into s3
Conflicts:
debian/changelog
Diffstat (limited to 'doc/special_remotes')
0 files changed, 0 insertions, 0 deletions