From: root Date: Fri, 12 Oct 2012 17:02:09 +0000 (+0000) Subject: Merge branch 'master' of git://gitorious.org/lorea/videolist X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=df98993b828ad4b12f64c54824e439804bc4af5c;p=lorea%2Felgg.git Merge branch 'master' of git://gitorious.org/lorea/videolist --- df98993b828ad4b12f64c54824e439804bc4af5c