diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-06 19:00:01 -0400 |
| commit | 6be8289158fd30d972ac22766452e7c9dc809e6f (patch) | |
| tree | ba4929c7c8f27d2b43051f637394115cda39258b /COPYRIGHT | |
| parent | 6ea1214fa5d19241851a977ab82437563e2afc81 (diff) | |
| parent | 971ed2a464a1a1e4d5e650e32390d232cd354d9d (diff) | |
Merge branch 'master' into relativepaths
Conflicts:
Locations.hs
debian/changelog
Diffstat (limited to 'COPYRIGHT')
0 files changed, 0 insertions, 0 deletions