Merge remote-tracking branch 'origin/master'
authorHideki Saito <hideki@hidekisaito.com>
Sun, 30 Nov 2014 11:05:35 +0000 (03:05 -0800)
committerHideki Saito <hideki@hidekisaito.com>
Sun, 30 Nov 2014 11:05:35 +0000 (03:05 -0800)
commit907eedaaf9ed1560628a1de9d920bddec2242990
tree86935339e7bb526ee17e63f305ac82e4b7768a47
parent58a50117f80f80fc5804233b596ff83272363def
parent627d305b9387f699c9402636fb29fc32a4291e5f
Merge remote-tracking branch 'origin/master'

Conflicts:
src/index.org
src/index.org