Merge branch 'master' of git+ssh://vcs.parisson.com/var/git/telemeta-doc

Conflicts:
	CMMR_2013/poster/poster_cmmr2013.tex

diff --cc CMMR_2013/poster/poster_cmmr2013.tex
index 568020843df2903387a5d90df92762340dfb82ef,5fb0a2c3ef3bfbc2dab06d4e4a658eec701bfcff..fbcc206940ce69f605901c78bbc607e40815d6e2
--- 1/CMMR_2013/poster/poster_cmmr2013.tex
--- 2/CMMR_2013/poster/poster_cmmr2013.tex
+++ b/CMMR_2013/poster/poster_cmmr2013.tex
@@@ -211,15 -214,9 +214,10 @@@ It should be noted that annotations an
  \begin{column}[T]{.49\linewidth}
    \begin{block}{TimeSide : open web audio processing framework}
  One specificity of the Telemeta architecture is to rely on an external component, \emph{TimeSide}, that offers audio player integration together with low and high level audio signal processing capabilities.
-  \fcolorbox{telemetaRed}{yellow!40}{%
-    \begin{minipage}{0.8\linewidth}\small
-      \vskip1ex
-      \begin{itemize}\bf
-      \item \url{https://github.com/yomguy/TimeSide/}
-      \end{itemize}
-      \vskip1ex
-    \end{minipage}
- }
++
+ \begin{center}
 -  \colorbox{yellow!50}{\bf \hskip3ex \url{http://www.timeside.org} \hskip3ex  }
++  \colorbox{yellow!50}{\bf \hskip3ex \url{https://github.com/yomguy/TimeSide/} \hskip3ex  }
+ \end{center}
  
      \begin{figure}[htbp]
    \centering