Merge commit 'origin/master' into HEAD
[urisagit/Stem.git] / conf / slave.stem
2008-12-05 Uri Guttman init commit