author | Roman Donchenko <roman.donchenko@itseez.com> | |
Mon, 21 Apr 2014 12:47:35 +0000 (16:47 +0400) | ||
committer | Roman Donchenko <roman.donchenko@itseez.com> | |
Mon, 21 Apr 2014 12:47:35 +0000 (16:47 +0400) |
No conflicts! Amazing!
Simple merge
Simple merge
Simple merge