URI: 

       tMerge pull request #1295 from romanz/master - electrum - Electrum Bitcoin wallet
  HTML git clone https://git.parazyd.org/electrum
   DIR Log
   DIR Files
   DIR Refs
   DIR Submodules
       ---
   DIR commit cf5d3e956bd2ecdd913ae93a56df06c28dc8a6aa
   DIR parent 12feb4cf9c3aec9c4debde17f70dc703849eb609
  HTML Author: ThomasV <electrumdev@gmail.com>
       Date:   Sat, 13 Jun 2015 14:05:09 +0200
       
       Merge pull request #1295 from romanz/master
       
       ttravis: use pytest (due to better test discovery)
       Diffstat:
         M .travis.yml                         |       2 +-
       
       1 file changed, 1 insertion(+), 1 deletion(-)
       ---
   DIR diff --git a/.travis.yml b/.travis.yml
       t@@ -3,4 +3,4 @@ language: python
        python:
            - "2.7"
        install: "pip install slowaes==0.1a1 ecdsa>=0.9 pbkdf2 requests pyasn1 pyasn1-modules tlslite>=0.4.5 qrcode SocksiPy-branch protobuf"
       -script: nosetests -e gui -e plugins
       +script: py.test -v