Murali Reddy 0f9f428ad1 Merge branch 'master' into events-framework ... Conflicts: api/src/com/cloud/event/EventTypes.java server/src/com/cloud/network/firewall/FirewallManagerImpl.java tools/whisker/LICENSE tools/whisker/descriptor-for-packaging.xml		2013-01-31 19:52:27 +05:30
..
LICENSE	Merge branch 'master' into events-framework	2013-01-31 19:52:27 +05:30
NOTICE	Updating the legal docs for packages, based on the latest whisker tool source.	2013-01-30 09:33:01 -05:00
descriptor-for-packaging.xml	Merge branch 'master' into events-framework	2013-01-31 19:52:27 +05:30
descriptor.xml	Corrected MPL 1.1 license name from 1.0 to 1.1 (this was a mistake I made when initially adding that license to the descriptor)	2013-01-30 09:33:10 -05:00