Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
authorMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:28:39 +0000 (21:28 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:28:39 +0000 (21:28 +0200)
commit25ed6b82c7d6e2ee799a4b69da046e4185333b35
tree0727fd99c3831af1146d34abfee83c991b241f8a
parentdd13db416633e3fb4242c7ff39d235799cd28910
parent5428eeeeaac1ecacbec2aecb9279cccd29e9c47d
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next