Merge branch 'stream_2016_dev'
authorDavid Testé <soonum@gnu.org>
Thu, 17 Mar 2016 20:05:34 +0000 (21:05 +0100)
committerDavid Testé <soonum@gnu.org>
Thu, 17 Mar 2016 20:05:34 +0000 (21:05 +0100)
1  2 
abyss.py
gstconf.py

diff --cc abyss.py
Simple merge
diff --cc gstconf.py
Simple merge