From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 6 Jan 2014 19:18:55 +0000 (+0200)
Subject: Fixed merge issues.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/0b3f54e8d9366b135697ac1d96c15a85f55fcb62?hp=0b3f54e8d9366b135697ac1d96c15a85f55fcb62

Fixed merge issues.
---