Merge https://github.com/openwrt/packages 1015/head
authoraTanW <villy@sft.ru>
Sun, 28 Jun 2015 14:58:00 +0000 (17:58 +0300)
committeraTanW <villy@sft.ru>
Sun, 28 Jun 2015 14:58:00 +0000 (17:58 +0300)
Conflicts:
net/ipsec-tools/Makefile

1  2 
net/ipsec-tools/Makefile

Simple merge