Merge branch 'config' of git+ssh://MJD@repo.or.cz/srv/git/system_status into config
commit735b0dc50a5e12d1d453e153c46b4f3f7f827dd6
authorMatthew Dawson <matthew@MJD.mlan.ca>
Tue, 22 Jul 2008 21:44:31 +0000 (22 17:44 -0400)
committerMatthew Dawson <matthew@MJD.mlan.ca>
Tue, 22 Jul 2008 21:44:31 +0000 (22 17:44 -0400)
tree7a089a2bfb9399c50fe0148c793dd5c3aa0230c1
parentfba09d365236d6bbfb74ae7eb0bc2fb69f720685
parentd404bb2e19312fd8fa2e3e293829d157f6a4f1ea
Merge branch 'config' of git+ssh://MJD@repo.or.cz/srv/git/system_status into config