OSDN Git Service

Merge branch 'master' of ssh://nevernote.git.sourceforge.net/gitroot/nevernote/nevernote
authorRandy Baumgarte <randy@fbn.cx>
Mon, 27 May 2013 13:43:01 +0000 (09:43 -0400)
committerRandy Baumgarte <randy@fbn.cx>
Mon, 27 May 2013 13:43:01 +0000 (09:43 -0400)
commit98957211e30167cee8d4d74aba5f9050f86a2435
tree739d39107c154f642fc69dbade3663aef394af37
parent3783160be4e2bf85f1d9ce73e6949de54aec6242
parentc3e49e158d87c0988e908b2de0849464fa8ad38e
Merge branch 'master' of ssh://nevernote.git.sourceforge.net/gitroot/nevernote/nevernote

Conflicts:
changelog.txt
changelog.txt