Release: Remove left-over merge markers
authorMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 19:22:35 +0000 (21:22 +0200)
committerMichael Tänzer <neo@nhng.de>
Sun, 8 Sep 2013 19:22:35 +0000 (21:22 +0200)
commite3ac4c85d6c95f55835acb681dc2c4103730933f
treea729a7db62de574e24b927dca1bd35dc815161cf
parent18a9f2205edaaf42ab15f48c2165c31883bba8e5
Release: Remove left-over merge markers

Signed-off-by: Michael Tänzer <neo@nhng.de>
www/gpg.php