Merge branch 'master' into agent
authorLuc Yriarte <luc.yriarte@intel.com>
Tue, 19 Mar 2013 09:37:04 +0000 (10:37 +0100)
committerLuc Yriarte <luc.yriarte@intel.com>
Tue, 19 Mar 2013 09:37:04 +0000 (10:37 +0100)
1  2 
cloudeebus/cloudeebus.js
cloudeebus/cloudeebus.py
setup.py

Simple merge
Simple merge
diff --cc setup.py
+++ b/setup.py
  from setuptools import setup
  
  setup(name = "cloudeebus",
-       version = "0.2.1",
+       version = "0.3.0",
        description = "Javascript-DBus bridge",
        author = "Luc Yriarte, Christophe Guiraud",
 -      author_email = "luc.yriarte@intel.com, christophe.guiraud@intel.com",
 +      author_email = "luc.yriarte@intel.com, christophe.guiraud@intel.com, frederic.paut@intel.com",
        url = "https://github.com/01org/cloudeebus/wiki",
        license = "http://www.apache.org/licenses/LICENSE-2.0",
        scripts = ["cloudeebus/cloudeebus.py"],