Merge branch 'master' of git://github.com/spesmilo/electrum

AUTHORS

@@ -1,7 +1,11 @@
-ThomasV - authored Electrum
+ThomasV - Creator and maintainer.
-flatfly - windows build author
+Animazing / Tachikoma - Styled the new GUI. Mac version.
-genjix - worked on server and parts of the gui
+Azelphur - GUI stuff.
-Julian Tosh (Tuxavant) - various changes
+Coblee - Alternate coin support and py2app support.
-Tachikoma - Mac version, and various fixes to the gui
+Deafboy - Ubuntu packages.
-coblee - Litecoin support in the server, Mac installer.
+EagleTM - Bugfixes.
-
+ErebusBat - Mac distribution.
+Genjix - Porting pro-mode functionality to lite-gui and worked on server
+Slush - Work on the server. Designed the original Stratum spec.
+Julian Toash (Tuxavant) - Various fixes to the client.
+rdymac - Website and translations.