Merge pull request #397 from vtjnash/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 28 Jun 2014 12:38:48 +0000 (20:38 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 28 Jun 2014 12:38:48 +0000 (20:38 +0800)
commit8373ad4ec27ff56ba9a2af3139d722c24f507e93
tree98bdf650562d591e95df7f8404539341c743d5b0
parentd10db52edbbc49100c9c12567f5273b6da3e4722
parentf41f03ab83d652f2e1d4b4dbb919a1203e53acde
Merge pull request #397 from vtjnash/develop

fix #394