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)
commit7a1d1b11a8652615b9a22b93034a7123d55f54a5
tree57d3c63123021b93a875fff5154f7c264aa90fc4
parent452f3fbf8ceeb78e9428866362a257cc5714adaa
parent955677733a3a2d68bb23263dfbd8f5f327105314
Merge branch 'master' into screenshot
bin/mplayer.pl