Merge branch 'master' of github.com:LnAlex/rainbowstream
authorLnAlex <contact@alexandrelion.com>
Mon, 3 Aug 2015 19:59:22 +0000 (21:59 +0200)
committerLnAlex <contact@alexandrelion.com>
Mon, 3 Aug 2015 19:59:22 +0000 (21:59 +0200)
1  2 
rainbowstream/rainbow.py
setup.py

Simple merge
diff --cc setup.py
Simple merge