From: Maxim Mamontov <faust.madf@gmail.com>
Date: Mon, 6 Jan 2014 19:18:55 +0000 (+0200)
Subject: Fixed merge issues.
X-Git-Tag: 2.409~325
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/9fdd58e794e43fc2435265c4fb2f6933758f3c0b?ds=inline;hp=9fdd58e794e43fc2435265c4fb2f6933758f3c0b

Fixed merge issues.
---