From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 22 Jan 2013 22:59:19 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: 1.0~149
X-Git-Url: https://git.sesse.net/?p=movit;a=commitdiff_plain;h=e2962f03fe8fb0b1c47be56eca26761da97453a0;hp=e2962f03fe8fb0b1c47be56eca26761da97453a0

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