Merge branch 'mob' of git+ssh://repo.or.cz/srv/git/siplcs into mob
authorMichael Lamb <mlamb1976@yahoo.com>
Mon, 24 Mar 2014 17:52:10 +0000 (24 10:52 -0700)
committerMichael Lamb <mlamb1976@yahoo.com>
Mon, 24 Mar 2014 17:52:10 +0000 (24 10:52 -0700)

Trivial merge