tree 9bffe9b98ea0a6cc119267efece03e292e3b2e5a
parent ab77a74c0fadbff9fb94f1370f9c01a4048543d0
parent 366ebd9ae05d79ba2ba805a2c1569219534c471f
author buyingyi <buyingyi@gmail.com> 1382550901 -0700
committer buyingyi <buyingyi@gmail.com> 1382550901 -0700

Merge branch 'master' into yingyi/asterix_fix