Merge remote-tracking branch 'origin/master' into demetrius

Conflicts:
	.mplayer/config

diff --cc .mplayer/config
index 0d31bf21ce22927dbffb0683acd4e7abba43c638,f52c614b5111f3f4df0ff2bf468d4a6683545013..a2361c320c6618370b78d612c2b274a977003f0a
--- 1/.mplayer/config
--- 2/.mplayer/config
+++ b/.mplayer/config
@@@ -1,6 -1,6 +1,7 @@@
  # Write your default config options here!
  heartbeat-cmd="xscreensaver-command -deactivate"
  stop-xscreensaver=1
 +vo=gl2
+ fs=yes