Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/l/livebox-viewer
authorSung-jae Park <nicesj.park@samsung.com>
Mon, 6 Aug 2012 05:09:18 +0000 (14:09 +0900)
committerSung-jae Park <nicesj.park@samsung.com>
Mon, 6 Aug 2012 05:10:29 +0000 (14:10 +0900)
commitce32976f51b9e6177951ec16772677dbc6bf7850
tree9f7242e3bef22e1550775474b2011941076cd169
parentf02985da1745954019f401616c7f3befabec2ae7
parentedb1791c7a51658b710fa3e9a956c089838b218b
Merge branch 'master' of ssh://165.213.149.219:29418/slp/pkgs/l/livebox-viewer

Conflicts:
src/client.c

Change-Id: I10c114976f3fae0455c0f6ef7a1147b9f476f80b
debian/changelog
packaging/liblivebox-viewer.spec