From: aTanW <redacted>
Date: Sun, 28 Jun 2015 14:58:00 +0000 (+0300)
Subject: Merge https://github.com/openwrt/packages
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=f60ca0b30f92dea792e776db08d7f109c172be58;p=openwrt-packages.git

Merge https://github.com/openwrt/packages

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

f60ca0b30f92dea792e776db08d7f109c172be58