Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Tue, 20 Nov 2012 09:39:31 +0000 (13:39 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Tue, 20 Nov 2012 09:39:31 +0000 (13:39 +0400)
commitda288bd2220911ddd7e3195c22c2585a56b62a5d
tree8eea61aec024d13d087f3e4f373e87aba3bf42c3
parentad2c8d36e790e188464658758425341b1e78f9e1
parenta8119393f0c65e5e56ae3906a5da2c4030c06d23
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/daemon/Makefile.am