Merge "Fix undefined std_class::fa_deleted_timestamp warning during undelete."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 9 Jul 2013 16:51:51 +0000 (16:51 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 9 Jul 2013 16:51:51 +0000 (16:51 +0000)

Trivial merge