Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 11 Mar 2014 13:19:14 +0000 (14:19 +0100)
commit1202ee15395ebd7bfe85c328d46e33b21f97f5eb
tree205387be81924140f9e76463bf3079fd6571bac1
parent826c22d66c3eae74bb4c7287cdd81478a5341e01
parent4c962356a0bf2ecc935ea08e19f273b3e9cc7c2d
Merge remote-tracking branch 'ummeegge/openvpn' into beyond-next