Merge remote-tracking branch 'tizen/upstream' into tizen 24/33424/1
authorRafal Krypa <r.krypa@samsung.com>
Fri, 9 Jan 2015 10:41:44 +0000 (11:41 +0100)
committerRafal Krypa <r.krypa@samsung.com>
Fri, 9 Jan 2015 10:42:38 +0000 (11:42 +0100)
commit82a57a763395134639bb13c8de2b7f7c99140e9f
tree7d34d61d2794c686ec1b53b80fe66346a4deaa5f
parentf8778149e91f5ec319b1bbf1251b2e7596902cd7
parente04ccf353b322e2a92bacf5ddd7eebfdbd6bdbf1
Merge remote-tracking branch 'tizen/upstream' into tizen

Change-Id: Ib8d978e8e9f223c8b76b52e6e0e04ce0949cf5a2
libsmack/libsmack.c