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)
commit6a008f32bf8d74295a7880c93b07b748365ee605
tree3b42c904ecacce0022b89e51284db7b410307828
parentb319acf7fe703b6c4257c8610003b007ff312821
parent6309e03eff7d792c0a587483032a8c7e641a53f1
Merge branch 'master' of github.com:rsoulliere/Evergreen-DocBook

Conflicts:
1.6/admin/ServersideInstallationVirtual.xml