Merge remote-tracking branch 'origin/master'
authorHideki Saito <hideki@hidekisaito.com>
Wed, 26 Jun 2013 02:05:28 +0000 (19:05 -0700)
committerHideki Saito <hideki@hidekisaito.com>
Wed, 26 Jun 2013 02:05:28 +0000 (19:05 -0700)
1  2 
src/index.org

diff --cc src/index.org
Simple merge