Merge remote branch 'remotes/j1mc/master'
authorChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 1 Nov 2011 04:42:12 +0000 (23:42 -0500)
committerChristopher Allan Webber <cwebber@dustycloud.org>
Tue, 1 Nov 2011 04:42:12 +0000 (23:42 -0500)
commit345b07ae13e95fb9a52a25bf8d605f82c6dc66da
tree56d4fc6d38574384b463db299ce6c0f1c300485e
parentb31269d5976977662178ec20d83a2a78e60ce9df
parent49fca84b9f508b677ed8a339667ffbffec498bd4
Merge remote branch 'remotes/j1mc/master'
docs/source/configuration.rst