Merge branch 'server' of github.com:yomguy/TimeSide into server

diff --cc timeside/__init__.py
index 57eb89dc8c81b8a23ae97987d7afadf03c4a9663,2bbc454e6a1b5e10386448b67e7a7774640b7800..6c8135b824a9e4cb2b627c6700215b3ac1a9809e
--- 1/timeside/__init__.py
--- 2/timeside/__init__.py
+++ b/timeside/__init__.py
@@@ -7,6 -7,5 +7,7 @@@ from . import analyze
  from . import grapher
  from . import encoder
  
+ 
  __version__ = '0.5.5'
 +
 +__all__ = ['api', 'core', 'decoder', 'analyzer', 'grapher', 'encoder']

diff --cc timeside/encoder/metadata.py
index 0000000000000000000000000000000000000000,86abf87642883531b7d92b596f50e82864d50e93..d3f1b419eaab535e478ffc27b6f223f53f46b384
mode 000000,100644..100644
--- /dev/null
--- 2/timeside/encoder/metadata.py
+++ b/timeside/encoder/metadata.py
@@@ -1,0 -1,25 +1,24 @@@
 -        
 -        
+ # -*- coding: utf-8 -*-
+ #
+ # Copyright (C) 2007-2009 Parisson
+ # Copyright (c) 2007 Olivier Guilyardi <olivier@samalyse.com>
+ # Copyright (c) 2007-2009 Guillaume Pellerin <pellerin@parisson.com>
+ #
+ # This file is part of TimeSide.
+ 
+ # TimeSide is free software: you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+ # the Free Software Foundation, either version 2 of the License, or
+ # (at your option) any later version.
+ 
+ # TimeSide is distributed in the hope that it will be useful,
+ # but WITHOUT ANY WARRANTY; without even the implied warranty of
+ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ # GNU General Public License for more details.
+ 
+ # You should have received a copy of the GNU General Public License
+ # along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
+ 
++
+ class Metadata(object):
+     pass