From: Maxim Mamontov <faust.madf@gmail.com>
Date: Tue, 5 Feb 2013 19:14:35 +0000 (+0200)
Subject: Removed merge artifacts.
X-Git-Tag: 2.409~365
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/7a5ef6cec95532655577ead42337d03d2b66f21c?hp=7a5ef6cec95532655577ead42337d03d2b66f21c

Removed merge artifacts.
---