murgatroid99 bb289c2902 Resolved merge conflict with upstream/master %!s(int64=11) %!d(string=hai) anos
..
compiler ecd49345b5 Use clang-format-3.5 %!s(int64=11) %!d(string=hai) anos
core 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos
cpp 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos
node bb289c2902 Resolved merge conflict with upstream/master %!s(int64=11) %!d(string=hai) anos
php 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos
ruby 48c9c4a59e Resolved merge conflicts with master %!s(int64=11) %!d(string=hai) anos