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)
commitf60ca0b30f92dea792e776db08d7f109c172be58
tree5e200b2eb9bbd074e79d68014339dc823ac2db56
parent2564e407d26d45ecc68befa7a3d1786dbb5982b5
parent9d423ba553041b5d45918b6ebd8677e43990cb88
Merge https://github.com/openwrt/packages

Conflicts:
net/ipsec-tools/Makefile
net/ipsec-tools/Makefile