OSDN Git Service

Merge branch 'develop'
authorEarnie Boyd <earnie@users.sourceforge.net>
Mon, 8 Oct 2012 20:03:54 +0000 (16:03 -0400)
committerEarnie Boyd <earnie@users.sourceforge.net>
Mon, 8 Oct 2012 20:03:54 +0000 (16:03 -0400)

Trivial merge