summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-19 01:12:18 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-02-19 01:12:18 +0000
commit00a6ce1239fccf7996d2bce3a857c5a71e89f5a7 (patch)
tree83d60cea373e68b6d1514a0b9f218206be0bdce1 /debian
parent047218dd909e80ddc2de9b7bbc18d9b2a0526184 (diff)
parente1372d384d28c959c2f3d37cb6c6aa07c5b0bacd (diff)
Merge branch 'upstream' into upstream-dfsg
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions