tree e754fb68e399b852d300f23c36e94a6ced1a29f1
parent 41c132e8ac051886e4eb06e7c3d58ced63d58057
parent 1ff37a7d30b085dc643dee7adb18759e3511661a
author Gustavo Niemeyer <gustavo@niemeyer.net> 1398966487 -0700
committer Gustavo Niemeyer <gustavo@niemeyer.net> 1398966487 -0700

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