Merge branch 'stream_2016_dev'

[libre-streamer.git] / gstconf.py

diff --git a/stream_2016/gstconf.py b/gstconf.py
similarity index 100%
rename from stream_2016/gstconf.py
rename to gstconf.py