Merge branch 'dev'
authorVimal Joseph <vimal.joseph@zyxware.com>
Sun, 14 Dec 2014 17:00:35 +0000 (22:30 +0530)
committerVimal Joseph <vimal.joseph@zyxware.com>
Sun, 14 Dec 2014 17:00:35 +0000 (22:30 +0530)

Trivial merge