Merge remote-tracking branch 'origin/f18'

Browse Source

Conflicts:
	strongswan.spec

...

This commit is contained in:

Pavel Šimerda

2014-01-07 15:09:19 +01:00

parent 19f4b38c81 1c9aa914d8

commit e7d4f90452

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available