Merge branch 'master' of github.com:01org/murphy submit/tizen/20140110.142837
authorKrisztian Litkey <kli@iki.fi>
Fri, 10 Jan 2014 14:17:11 +0000 (16:17 +0200)
committerKrisztian Litkey <kli@iki.fi>
Fri, 10 Jan 2014 14:17:11 +0000 (16:17 +0200)
commit5322c380a10436c614f9441d6def64ff550de64c
tree555dbcf7fb8861f9f73c5ed86ab3b79361033fa9
parentc189f3af0628d3343242f00b6905dfe8e9bc9ab7
parent98c7740638d4af4cfab4ac4b20d7620bdcb00416
Merge branch 'master' of github.com:01org/murphy