Skip to content

Merge upstream#2

Merged
ppaulojr merged 9 commits intoNetfilter-Com:masterfrom
openwrt-mirror:master
Apr 7, 2015
Merged

Merge upstream#2
ppaulojr merged 9 commits intoNetfilter-Com:masterfrom
openwrt-mirror:master

Conversation

@ppaulojr
Copy link
Copy Markdown
Member

@ppaulojr ppaulojr commented Apr 7, 2015

Merge upstream

nbd and others added 9 commits April 6, 2015 10:07
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45278 3c298f89-4303-0410-b956-a3cf2f4a3e73
thanks to Arjen de Korte

Signed-off-by: Steven Barth <steven@midlink.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45279 3c298f89-4303-0410-b956-a3cf2f4a3e73
…igurations

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45280 3c298f89-4303-0410-b956-a3cf2f4a3e73
…ry were swapped (fixes #19400)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45281 3c298f89-4303-0410-b956-a3cf2f4a3e73
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45282 3c298f89-4303-0410-b956-a3cf2f4a3e73
… to signify)

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45283 3c298f89-4303-0410-b956-a3cf2f4a3e73
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45284 3c298f89-4303-0410-b956-a3cf2f4a3e73
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45285 3c298f89-4303-0410-b956-a3cf2f4a3e73
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45286 3c298f89-4303-0410-b956-a3cf2f4a3e73
ppaulojr added a commit that referenced this pull request Apr 7, 2015
@ppaulojr ppaulojr merged commit d5894aa into Netfilter-Com:master Apr 7, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant