xia 1ad237a952 Merge branch 'master' into zimuxia/store-status ...

Conflicts:
	plan/plans/info.go

2015-11-12 20:48:37 +08:00

..

plans

Merge branch 'master' into zimuxia/store-status

2015-11-12 20:48:37 +08:00

plan.go

*: refactor OuterQuery

2015-09-16 22:13:12 +08:00