Merge branch 'release-0.25' into devel
authorGui Chen <gui.chen@intel.com>
Thu, 29 May 2014 10:21:31 +0000 (06:21 -0400)
committerGui Chen <gui.chen@intel.com>
Thu, 29 May 2014 10:21:31 +0000 (06:21 -0400)
commit73381d8fae76d5c2ec76b6d526f6837218fa1d64
tree069924b761af270c452bdf9ade99606b3ac27337
parent01cee7db536e98f7e9bf33fad2d2e96ba859f820
parent9f76ef6784e1545ddf899cbe7aae4708fa4a3192
Merge branch 'release-0.25' into devel

Signed-off-by: Gui Chen <gui.chen@intel.com>
Conflicts:
debian/changelog

Change-Id: Ia1ff5d0d0ae4ced64cffd3547bee0ffd02fb3976