| commit | b38f586fbff4ac14491369f0fe3db0f60336fe77 | [log] [tgz] |
|---|---|---|
| author | Steve Hay <stevehay@apache.org> | Thu Jun 12 09:08:54 2014 +0000 |
| committer | Steve Hay <stevehay@apache.org> | Thu Jun 12 09:08:54 2014 +0000 |
| tree | da7ee48e410adec824f92eaab1f23541ce9a481d | |
| parent | 4dc86de396e03a673df474c38847394cd572b81a [diff] |
[Merge only "recorded", i.e. blocked from merge. This was the only change on trunk not in httpd24, and will hopefully now allow a reintegrate/automatic merge to go ahead.] Merged revision(s) 1151791 from perl/modperl/trunk: Initialized merge tracking via "svnmerge" with revisions "1-1151159" from https://svn.eu.apache.org/repos/asf/perl/modperl/branches/httpd24 ........ git-svn-id: https://svn.apache.org/repos/asf/perl/modperl/branches/httpd24@1602098 13f79535-47bb-0310-9956-ffa450edef68