diff options
author | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-01 16:38:03 -0500 |
---|---|---|
committer | Joshua Ismael Haase Hernández <hahj87@gmail.com> | 2011-06-01 16:38:03 -0500 |
commit | 1cd5b2db38e3bbc4a3184b2c199f3745c3a40698 (patch) | |
tree | e3c8de37bb43568812aef562090e7f2d5f061b4a /extra/vde2/iptables.rules.sample | |
parent | 7345649cbc9f7d36bc9ad8edab017461efd95051 (diff) | |
parent | 311d0420d77867bdb1066d38743e68e596a17ce5 (diff) |
Merge branch 'master' of vparabola:~/abslibre-pre-mips64el
Conflicts:
community/python-sympy/PKGBUILD
Diffstat (limited to 'extra/vde2/iptables.rules.sample')
0 files changed, 0 insertions, 0 deletions