Merge remote-tracking branch 'remotes/origin_deadface/master' nvc-v0.5.0
authorMASM fan <masmfan@gmail.com>
Thu, 11 Dec 2014 17:34:31 +0000 (21:34 +0400)
committerMASM fan <masmfan@gmail.com>
Thu, 11 Dec 2014 17:34:31 +0000 (21:34 +0400)

Trivial merge