diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-07-01 02:12:43 +0000 |
| commit | fb2853a555984c7dea882ea7622636699b922687 (patch) | |
| tree | d5a74ea1d8c6f15f98bcd1c30a9a665c4bccb375 /debian/local/partman/commit.d/40hurd_reload-partitions | |
| parent | 555a202f0debbb1f9ac81bc449ba9084a6d847a2 (diff) | |
| parent | 033f502218f0a8f1996821c70bc007d8f08bf9ed (diff) | |
Merge branch 'master' into xkb
Conflicts:
config.make.in
configure.in
Diffstat (limited to 'debian/local/partman/commit.d/40hurd_reload-partitions')
0 files changed, 0 insertions, 0 deletions