URI: 
       tMerge branch 'master' of git://github.com/spesmilo/electrum - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit 1b65dd7974ba4aa037fa88a854e1abc634fb9bb8
   DIR parent b05df324bf50d4bc002d19cd673426e06ade45e0
  HTML Author: ThomasV <thomasv@gitorious>
       Date:   Fri, 20 Feb 2015 10:11:38 +0100
       
       Merge branch 'master' of git://github.com/spesmilo/electrum
       
       Diffstat:
         M .travis.yml                         |       1 +
         M plugins/openalias.py                |      30 +++++-------------------------
       
       2 files changed, 6 insertions(+), 25 deletions(-)
       ---
   DIR diff --git a/.travis.yml b/.travis.yml
       t@@ -1,3 +1,4 @@
       +sudo: false
        language: python
        python:
            - "2.7"
   DIR diff --git a/plugins/openalias.py b/plugins/openalias.py
       t@@ -1,30 +1,10 @@
        # Copyright (c) 2014-2015, The Monero Project
       -#
       +# 
        # All rights reserved.
       -#
       -# Redistribution and use in source and binary forms, with or without modification, are
       -# permitted provided that the following conditions are met:
       -#
       -# 1. Redistributions of source code must retain the above copyright notice, this list of
       -#    conditions and the following disclaimer.
       -#
       -# 2. Redistributions in binary form must reproduce the above copyright notice, this list
       -#    of conditions and the following disclaimer in the documentation and/or other
       -#    materials provided with the distribution.
       -#
       -# 3. Neither the name of the copyright holder nor the names of its contributors may be
       -#    used to endorse or promote products derived from this software without specific
       -#    prior written permission.
       -#
       -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
       -# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
       -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
       -# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
       -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
       -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
       -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
       -# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
       -# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
       +
       +# This plugin is licensed under the GPL v3 license (see the LICENSE file in the base of
       +# the project source code). The Monero Project reserves the right to change this license
       +# in future to match or be compliant with any relicense of the Electrum project.
        
        # This plugin implements the OpenAlias standard. For information on the standard please
        # see: https://openalias.org