From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 13 Nov 2010 18:17:17 +0000 (+0100)
Subject: Merge commit 'origin/master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=846571ac8455c663fc75b0970eb76c4a92eea3be;hp=f55596ee38abe00753d06482f0616500be20cd87;p=people%2Fpmueller%2Fipfire-2.x.git

Merge commit 'origin/master' into next
---

diff --git a/html/html/images/urlfilter/copy.gif b/html/html/images/urlfilter/copy.gif
new file mode 100644
index 0000000000..a91100afc5
Binary files /dev/null and b/html/html/images/urlfilter/copy.gif differ