diff options
| author | Joey Hess <joey@kitenet.net> | 2012-09-10 13:11:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-10 13:11:32 -0400 |
| commit | cdb8852a4b1ef3e83f5f9fdc60285c015a38c0e1 (patch) | |
| tree | 434ce410b4ec1ae57a0172684997e1d0cfef056a /autoscripts | |
| parent | 073034791eea9df519a06deb4058908e30d0fa7d (diff) | |
| parent | d27f02705863d955be3d15410919a9faa2eb3ab0 (diff) | |
Merge branch 'wheezy'
Conflicts:
man/po4a/po/de.po
Diffstat (limited to 'autoscripts')
0 files changed, 0 insertions, 0 deletions