[Pkg-bitcoin-commits] [python-quamash] 35/269: Merge branch 'master' into unix

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository python-quamash.

commit fc6e92fdee2dca4f9a3680357c0443d9a2ac85f1
Merge: 21cbea9 514383e
Author: Arve Knudsen <arve.knudsen at gmail.com>
Date:   Tue Jul 1 21:05:53 2014 +0200

    Merge branch 'master' into unix
    
    Conflicts:
    	.idea/misc.xml
    	.idea/quamash.iml
    	quamash/__init__.py

 .gitignore                      | 3 +--
 .idea/.name                     | 1 -
 .idea/encodings.xml             | 5 -----
 .idea/misc.xml                  | 5 -----
 .idea/modules.xml               | 9 ---------
 .idea/quamash.iml               | 9 ---------
 .idea/scopes/scope_settings.xml | 5 -----
 .idea/vcs.xml                   | 7 -------
 8 files changed, 1 insertion(+), 43 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/python-quamash.git