Merge branch 'master' into screenshot
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 16 Oct 2009 13:39:14 +0000 (15:39 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 16 Oct 2009 13:39:14 +0000 (15:39 +0200)
1  2 
bin/mplayer.pl

diff --cc bin/mplayer.pl
Simple merge