5 Commits (8bf9103fcf8f6f24366f01bb70066a849a42d56d)

Author	SHA1	Message	Date
ibuler	e2ac212fc3	resolve confilict	2015-04-20 20:56:26 +08:00
ibuler	09d3763a02	fix a bug	2015-04-20 20:54:10 +08:00
ibuler	ea37374ea5	����django 1.6	2015-04-20 18:56:30 +08:00
ibuler	412dadce76	version 2.0.0 beta	2015-04-20 10:12:11 +08:00
halcyon	6759146426	bugs	2015-03-17 15:28:48 +08:00