projects / evergreen / pines.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b319acf 6309e03)
Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook
authorSteve Sheppard <ssheps@gmail.com>
Thu, 30 Sep 2010 19:01:10 +0000 (15:01 -0400)
committerSteve Sheppard <ssheps@gmail.com>
Thu, 30 Sep 2010 19:01:10 +0000 (15:01 -0400)
Conflicts:
1.6/admin/ServersideInstallationVirtual.xml


Trivial merge
Evergreen working repo (PINES)