Merge branch 'bstring' of ssh://git.code.sf.net/p/vacation/code into bstring
Authored by: Chris Samuel 2013-07-28
Parents: [3b61fa][d866d7]