diff options
author | Yves-Alexis Perez <corsac@debian.org> | 2013-10-17 21:55:46 +0200 |
---|---|---|
committer | Yves-Alexis Perez <corsac@debian.org> | 2013-10-17 21:55:46 +0200 |
commit | 133bde4810ea93957dc09d0bf299f5ddfeaaa8a0 (patch) | |
tree | 8cf8501319e9811268e1593f7be3f8137c37e011 /ChangeLog | |
parent | 813c38f9b3251a7f6922c03c4e9fd81124d620b6 (diff) | |
parent | e57cde5b5d03b838d08da2605bcab68d8aa3b502 (diff) | |
download | vyos-strongswan-133bde4810ea93957dc09d0bf299f5ddfeaaa8a0.tar.gz vyos-strongswan-133bde4810ea93957dc09d0bf299f5ddfeaaa8a0.zip |
Merge branch 'sid'
Conflicts:
debian/changelog
Diffstat (limited to 'ChangeLog')
0 files changed, 0 insertions, 0 deletions