Merge remote-tracking branch 'upstream/master' into toc

This commit is contained in:
kristi
2012-05-14 10:44:50 -07:00
@@ -231,6 +231,7 @@ a:hover, a:visited {
/* @section page-footer */
.page #footer {
clear: both;
border-top: 1px solid #ddd;
margin: 1em 0 7em;
}