Merge branch 'master' into unstable
Merge branch 'master' into unstable
Added some comments..
On branch unstable
Changes to be committed:
modified:   lib/herod.js
Merge branch 'unstable'