Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev
authorVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 25 Oct 2012 09:42:14 +0000 (13:42 +0400)
committerVitaliy Cherepanov <v.cherepanov@samsung.com>
Thu, 25 Oct 2012 09:42:14 +0000 (13:42 +0400)
commitae41d786bbe3adaddc894fcda815b39686b45145
treeff03f90a9dade71e22bf629838f51e78f5b1aad1
parentd5695fd5cc9e1f06b90502bfebdc7f835d1f7339
parent6922527fdf0d22ac59ab9beea94834d142bb606c
Merge branch 'dev' of 106.109.8.71:/srv/git/dbi into dev

Conflicts:
src/probes/probes.def