summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-03-11 02:51:15 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-03-11 02:51:15 +0000
commita690f3130a425a556e9e71dd31de87601db22586 (patch)
tree83d60cea373e68b6d1514a0b9f218206be0bdce1 /debian/changelog
parentda1d3f96dce69b29a03101dd4522da589b258f04 (diff)
parent91db63c82b07eb969c9074862a30ed90ed7ef79a (diff)
Merge remote-tracking branch 'upstream/master' into upstream
Diffstat (limited to 'debian/changelog')
0 files changed, 0 insertions, 0 deletions