[vlc-commits] Merge branch 'master' into windowless

npapi-vlc | branch: windowless | Jean-Baptiste Kempf | Thu Dec 13 18:59:58 2012 +0100| [476de23685db318d482a7cdb979a04db32592ce8] | committer: Jean-Baptiste Kempf Merge branch 'master' into windowless > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=476de23685db318d482a7cdb979a04

[vlc-commits] Merge branch 'master' into windowless

npapi-vlc | branch: windowless | Jean-Baptiste Kempf | Thu Dec 13 18:35:51 2012 +0100| [e0d531cbfc8beec79b0531323db8950c8794abc7] | committer: Jean-Baptiste Kempf Merge branch 'master' into windowless > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=e0d531cbfc8beec79b0531323db895