Merge remote-tracking branch 'joar/media-fixes'
authorJoar Wandborg <git@wandborg.com>
Mon, 9 Apr 2012 18:36:50 +0000 (20:36 +0200)
committerJoar Wandborg <git@wandborg.com>
Mon, 9 Apr 2012 18:36:50 +0000 (20:36 +0200)
commitd684af2766f855f22cd3947845d9f8b513b5751d
tree0f9bd0ada8e28659dd698029e00050ba1300b9e9
parentab299ba44991e32152cfdca9997ecdad2ab40c5a
parent196a5181327dd4e4a3493ccdc55337d4705b066f
Merge remote-tracking branch 'joar/media-fixes'