Merge branch 'master' into agent_future
authorFrederic PAUT <frederic.paut@linux.intel.com>
Mon, 24 Jun 2013 10:18:07 +0000 (12:18 +0200)
committerFrederic PAUT <frederic.paut@linux.intel.com>
Mon, 24 Jun 2013 10:18:07 +0000 (12:18 +0200)
commit236c26d85a85cccc2cc43f8678524e6de3c909b4
tree4d09c24e67e92de90ae15494d2c3e16da1729b4c
parentcb34b64b4cbdf3028f741e5f25259054fe2c25de
parentc2e2edfe53a07103b72208b4702b627d2aec00a1
Merge branch 'master' into agent_future

Conflicts:
cloudeebus/cloudeebus.js
cloudeebus/cloudeebus.py
setup.py
TODO
cloudeebus/cloudeebus.js