Commit f1c19cc7d74bfda617726225e6ac9eec358d382b

  • avatar
  • admin
  • Sun Apr 01 19:23:37 IST 2012
  • Tree SHA1: 08e3f95
  • Parent SHA1: a702269 (Push for anon, implemented history)
  • Parent SHA1: ef75518 (Changes in overlay bars) 
Merge branch 'master' of 10.0.0.2:/home/ecthiender/server/www/alipi

fixed Conflicts:
	server/wsgi/pageEditor.js