Merge remote-tracking branch 'upstream/master'

2015-09-25 15:12:34 -04:00
commit 0a42a28eeb
@@ -62,12 +62,6 @@
            <artifactId>httpclient</artifactId>
            <version>${apache-httpcomponents.version}</version>
        </dependency>
-        <dependency>
-            <groupId>net.iharder</groupId>
-            <artifactId>base64</artifactId>
-            <version>${base64.version}</version>
-            <scope>runtime</scope>
-        </dependency>
        <dependency>
            <groupId>org.bouncycastle</groupId>
            <artifactId>bcprov-jdk15on</artifactId>