diff options
| author | Michael Vogt <mvo@debian.org> | 2013-11-29 20:48:54 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2013-11-29 20:48:54 +0100 |
| commit | 2cd3c6b82a67995d25a6bdbc78d351c3170ed1f0 (patch) | |
| tree | 4d0700bbca5db1ac448134f3d057e08293073936 /Makefile | |
| parent | ec980be7637b735aa91d7091dae6e18b150cb724 (diff) | |
| parent | 0cd4e696306af28f98c0f810ed18b052919205c8 (diff) | |
Merge branch 'debian/sid' into ubuntu/master
Conflicts:
debian/changelog
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions