Merge branch 'master' into screenshot
authorDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 16 Oct 2009 13:32:20 +0000 (15:32 +0200)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Fri, 16 Oct 2009 13:32:20 +0000 (15:32 +0200)
commit8cd5af811d3da4b3174922a68a2babaeaa87e35c
treef25e1f3535c190a3e982af4e76e4e0e279f684b9
parenta31acca7b1620510d9afbdcd0ddc484e633ad453
parentc06fec35f1049b255d24aa05858a468ca2b10167
Merge branch 'master' into screenshot
bin/mplayer.pl