# HG changeset patch
# User Peter D. Barnes, Jr. <barnes26@llnl.gov>
# Date 1373578263 25200
# Node ID bd4f41ba2c3aec34d1bcac617f684a5cba1a793c
# Parent  58beef4d4613740b6b54810d62c0bfb20f8cc9ba# Parent  d8d9287f388c1a838c33abbe72cdc01bd1435c28
Merge closed branch docs

diff -r 58beef4d4613 -r bd4f41ba2c3a src/core/test/object-test-suite.cc