projects / Evergreen-DocBook.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c6e0cae a865c96)
Merge remote-tracking branch 'upstream/master'
authorYamil Suarez <github@yamil.com>
Wed, 19 Oct 2011 15:42:42 +0000 (11:42 -0400)
committerYamil Suarez <github@yamil.com>
Wed, 19 Oct 2011 15:42:42 +0000 (11:42 -0400)
Conflicts:
1.6/admin/Upgrading-Evergreen_1.6.xml
1.6/admin/serversideinstallation.xml
2.0/admin/Upgrading-Evergreen-2.0.xml
2.0/admin/serversideinstallation_2.0.xml


Trivial merge
Mirror of Evergreen doc repo: git://github.com/rsoulliere/Evergreen-DocBook.git