tree 06b0e834c9247c3c57109bfc7bcdf05e6cb02297
parent 4f3d34e492b8930c50204a216d960e7da0dc5f63
parent 1418a9bc452f9cf4efa70307cafcb10743e64a56
author Gustavo Niemeyer <gustavo@niemeyer.net> 1394803344 -0300
committer Gustavo Niemeyer <gustavo@niemeyer.net> 1394803344 -0300

Merge branch 'master' of github.com:go-yaml/yaml