summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-12-06 01:45:20 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-12-06 01:45:20 +0100
commit4f6cbf004dbc2e5b0d17f23cbf7569e94783952a (patch)
treea1fd5df453625ede8e3e47bfc8cc5a03c329bb22 /debian/changelog
parent15629adf11dd34e5607bb3ed5eaa6b604e762a60 (diff)
parentf115339ad63bfb0005bc3d1ebfb05e1a0aecc0db (diff)
Merge branch 'upstream-merged'
Diffstat (limited to 'debian/changelog')
0 files changed, 0 insertions, 0 deletions