Merge branch 'master' of github.com:Lyndir/MasterPassword

Conflicts:
	Site/2013-05/index.html

Site/2013-05/index.html

@@ -83,7 +83,7 @@
                 Mac <a title="Mac (graphical interface)" href="https://itunes.apple.com/app/id662763204" onclick="_gaq.push(['_trackPageview', '/outbound/gui/mac']);">App Store<img class="popup border" src="img/mac-gui.png" /></a>,
                 <a title="Mac (command-line interface)" href="#">Homebrew<img class="popup" src="img/mac-homebrew.png" /></a> |
                 <a title="Mac, Linux, UNIX, Windows (graphical interface)" href="https://ssl.masterpasswordapp.com/masterpassword-gui.jar" onclick="_gaq.push(['_trackPageview', '/outbound/gui/java']);">Desktop (Java)<img class="popup" src="img/java-gui.png" /></a> |
-                Terminal (<a title="Mac, Linux, POSIX (command-line interface)" href="https://ssl.masterpasswordapp.com/masterpassword-cli.tar.gz" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Native C<img class="popup" src="img/c-cli.png" /></a>) |
+                <a title="Mac, Linux, POSIX (command line interface)" href="https://ssl.masterpasswordapp.com/masterpassword-cli.tar.gz" onclick="_gaq.push(['_trackPageview', '/outbound/cli/c']);">Terminal (C)<img class="popup" src="img/c-cli.png" /></a> |
                 <a title="Android" href="https://ssl.masterpasswordapp.com/masterpassword-android.apk" onclick="_gaq.push(['_trackPageview', '/outbound/android']);">Android (Beta)<img class="popup" src="img/android.png" /></a> |
                 <a title="JavaScript" href="https://js.masterpasswordapp.com/" onclick="_gaq.push(['_trackPageview', '/outbound/js']);">Web (Beta)<img class="popup border" src="img/web.png" /></a>
             </h4>

Site/2013-05/masterpassword-android.apk

@@ -0,0 +1 @@
+masterpassword-android-2.2.apk

Site/2013-05/masterpassword-gui.jar

@@ -0,0 +1 @@
+masterpassword-gui-2.2.jar

Site/2013-05/masterpassword-gui.jar.rev

@@ -1 +1 @@
-3932857c2117b8a399fdcb4fa888e9dc1a6818ee
+feddd038e36c72f8f5af2ed033f414aee1e97e2e