13 Commits (acfa0171cad29e6d49fe0c4ea8ed3f679ff1ab14)

Author	SHA1	Message	Date
ibuler	6c10cf1a5a	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-22 18:58:26 +08:00
halcyon	8a8f68d908	使用username 去掉log_ha里的print	2015-04-22 18:04:23 +08:00
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	86e334e4fa	last bug?	2015-04-19 18:36:41 +08:00
ibuler	6d6e9d97b5	�޸�	2015-04-18 18:04:01 +08:00
halcyon	f19b274fcc	bug	2015-04-18 16:58:15 +08:00
guanghongwei	3424bef5d0	�޸�bug	2015-04-15 12:07:59 +08:00
halcyon	ce6494ba64	bugs	2015-03-14 13:13:46 +08:00
halcyon	c84f124511	bug	2015-02-09 19:02:25 +08:00
halcyon	433974d77d	改bug	2015-02-05 18:53:57 +08:00