summaryrefslogtreecommitdiff
path: root/src/leap
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2015-01-13 16:53:38 -0500
committerMicah Anderson <micah@riseup.net>2015-01-13 16:53:38 -0500
commit1d2648554006335bc04c4ae21c423578dbd8ee19 (patch)
tree6ab6a6e5f183addc1e3822c5cea0bb1f29528c3d /src/leap
parentea9bdf4f0802285238b5432b5f05decb5267b218 (diff)
parent67b738c2f5922dbc5cf105e9617ce6d1d5e4e8e3 (diff)
Merge branch 'debian/experimental' into ppappa
Conflicts: debian/changelog
Diffstat (limited to 'src/leap')
0 files changed, 0 insertions, 0 deletions