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)
commit7cbfca4f321f573de9ae95dbfa280f28575556f5
tree756e40c7ef59fc7096e39d9750bad844aaf0b7bf
parent7476e42f563257823e8045504ac7a3a5868009ab
parentcf1c71b5e2173cf5bfe94b3794a6776fc9a89946
Merge remote-tracking branch 'remotes/origin_deadface/master'