Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Conflicts: README.md

Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts: README.md
c87cc59b · obscuren · 8f84ddbb · 0f26a623 · c87cc59b
Commit c87cc59b authored Mar 15, 2015 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

README.md README.md +1 -1

No files found.
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ Automated (dev) builds
 * [Docker](https://registry.hub.docker.com/u/ethereum/client-go/)
 * [OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg)
 * Ubuntu
-  [Trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/ethereum-cli_0.9.0%2B192SNAPSHOT20150314224122trusty-0ubuntu1_i386.deb) |
+  [trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/ethereum-cli_0.9.0%2B192SNAPSHOT20150314224122trusty-0ubuntu1_i386.deb) |
  [utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/ethereum-cli_0.9.0%2B194SNAPSHOT20150314224124utopic-0ubuntu1_i386.deb)
 * [Windows] Coming soon&trade;