Giovanni Campagna 5d26fc2e71 Merge branch 'master' into extension-live-disable ...

Conflicts:
	extensions/apps-menu/extension.js

2011-08-18 15:36:50 +02:00

..

extension.js

Merge branch 'master' into extension-live-disable

2011-08-18 15:36:50 +02:00

Makefile.am

systemMonitor: new extension

2011-05-11 00:42:37 +04:00

metadata.json.in

systemMonitor: new extension

2011-05-11 00:42:37 +04:00

stylesheet.css

systemMonitor: new extension

2011-05-11 00:42:37 +04:00