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)
commitc14ce07ae2a01531a8ac1330cf0280111917ef6c
tree676614d825112cd53f32b176849c76cb2450d070
parentc6e0cae324fcca251ee67b71bad7cee560fe98c3
parenta865c96a3278a69624db31fdb2e90e60ea570a98
Merge remote-tracking branch 'upstream/master'

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