Anand Doshi c6aecb3f97 Merge branch 'master' into edge ...

Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt

2013-04-16 21:32:06 +05:30

..

doctype

removed colour fields from txt files

2013-03-05 14:19:48 +05:30

page

Merge branch 'master' into edge

2013-04-16 21:32:06 +05:30

__init__.py

support ticket fix

2012-12-28 13:26:08 +05:30