merged upstream changes

This commit is contained in:
Wookey
2012-01-04 12:22:56 +00:00
33 changed files with 360 additions and 234 deletions

View File

@@ -7,14 +7,13 @@
<link rel="stylesheet" type="text/css" href="../../css/main2.css" />
<body id="logbk">
<h1>Expo 2011</h1>
<!--fragment for each trip-->
<!--fragment for each trip --
<div class="tripdate" id="t2011-07-">2011-07</div>
<div class="trippeople"><u></u></div>
<div class="triptitle"></div>
<p></p>
<div class="timeug">T/U: </div>
<!--end of fragment-->
--end of fragment-->
<div class="tripdate" id="t2011-07-18">2011-07-18</div>
<div class="trippeople"><u>Chris Smith</u></div>
<div class="triptitle">Chris Rescues a sheep</div>
@@ -1238,4 +1237,4 @@ massage is 'March of the Ents'.
</body>
</html>
</html>