Merge remote branch 'remotes/origin/fix-reset'
authorBdale Garbee <bdale@gag.com>
Thu, 6 May 2010 18:47:30 +0000 (12:47 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 6 May 2010 18:47:30 +0000 (12:47 -0600)
commit314d27a73c903fef2968dabac3d5313573713460
treeac3099a0db42254d7b96334eaf64d7275bc7549e
parentfa77db2ffd8a749c93767db5a6311131e00473ae
parent823fc0ac27b8df9b4ba1ca0f229b431baf5b46dd
Merge remote branch 'remotes/origin/fix-reset'