Merge pull request #1926 from minggo/master

Synchronize from upstream
This commit is contained in:
minggo 2013-01-29 02:16:29 -08:00
commit aa306d637e
1 changed files with 1 additions and 1 deletions

@ -1 +1 @@
Subproject commit 91031e6633a03c3106a228a0f29b2483ed58cd9f
Subproject commit b45d2efc0013ee30836a22c0936a214084982fea