Merge branch 'master' of github.com:xach/vecto
commit4ae692f129574987f69b13a85c4602d98462f1ec
authorZach Beane <xach@xach.com>
Fri, 19 Jul 2013 02:43:26 +0000 (18 22:43 -0400)
committerZach Beane <xach@xach.com>
Fri, 19 Jul 2013 02:43:26 +0000 (18 22:43 -0400)
treebd36effcfc48bbbc13cab61e562497549958ad76
parent892a66657cc220b61e4a6357459d4e337b348433
parent0386c5bc7f598651829a87ac96ee49384bcbf0d0
Merge branch 'master' of github.com:xach/vecto

Conflicts:
vecto.asd
vecto.asd