Make it possible to choose the bouncing type for dock icon (once, infinite).
Merge branch 'master' of https://github.com/fmichea/iTerm2 into fmichea-master
Minor clean up of pull request 165. Add -defaultIndex method to Trigger subclasses that let them specify the index of the default parameter value.
Merge branch 'master' of https://github.com/gnachman/iTerm2