Merge remote-tracking branch 'origin/filmowa' into filmowa
authorcain-ish <mariusz.machuta@gmail.com>
Tue, 22 Mar 2016 13:30:05 +0000 (14:30 +0100)
committercain-ish <mariusz.machuta@gmail.com>
Tue, 22 Mar 2016 13:30:05 +0000 (14:30 +0100)

Trivial merge