tree 25a2340b875d48897fa26dc56e859fa31d640870
parent 4754e053cc578b8320c315d2f4fc6aece5b82b7e
parent 0c20db8d67d3c65d0a64c1fa087719281455db8b
author Muroi Yoshitomo <freestyle.yoshikun@gmail.com> 1387350462 -0800
committer Muroi Yoshitomo <freestyle.yoshikun@gmail.com> 1387350462 -0800

Merge pull request #4 from y-higuchi/RAMCloud-yoshi

Fix merge miss