commit cf1516308cd3f9d75f1715cd6caca113fc588daa
Merge: abe12cf 3d1bfe1
Author: Klaus Aehlig <[email protected]>
Date: Mon Jan 12 14:47:20 2015 +0100
Merge branch 'stable-2.12' into stable-2.13
* stable-2.12
Look up RPC port
Add withDefaultOnIOError
Fix typo in gnt_cluster output
* stable-2.11
Also count your own vote
* stable-2.10
Fix typo in gnt_cluster output
Signed-off-by: Klaus Aehlig <[email protected]>
--
Klaus Aehlig
Google Germany GmbH, Dienerstr. 12, 80331 Muenchen
Registergericht und -nummer: Hamburg, HRB 86891
Sitz der Gesellschaft: Hamburg
Geschaeftsfuehrer: Graham Law, Christine Elizabeth Flores
