summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-12-27 16:50:13 +0000
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-12-27 16:50:13 +0000
commitf8e898508b9f4326369a41c8411db2f3cfdbfaaa (patch)
tree83d60cea373e68b6d1514a0b9f218206be0bdce1 /debian
parentd4ac18c9fcb37cc5c7949d3e0d6e04ec8a7d6a52 (diff)
parent67ee1ccccf814f623401650cd6d9e59db8d3d13e (diff)
Merge branch 'upstream' into upstream-dfsg
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions