Merge in HEAD, up to 9866.

This commit is contained in:
Colin Kuskie 2009-03-17 23:45:21 +00:00
parent c7a66861a6
commit 2bd7a60a01
107 changed files with 6258 additions and 2436 deletions

View file

@ -1196,6 +1196,12 @@ Couldn't open %-s because %-s <br />
context => q{Asset Manager label, as in "locked by admin"},
},
'assetHistory' => {
message => q{Asset History},
lastUpdated => 0,
context => q{Admin Console label. Shows the history of assets in this site.},
},
};
1;