]> granicus.if.org Git - apache/commit
mis-merge
authorJim Jagielski <jim@apache.org>
Mon, 22 Oct 2012 16:56:02 +0000 (16:56 +0000)
committerJim Jagielski <jim@apache.org>
Mon, 22 Oct 2012 16:56:02 +0000 (16:56 +0000)
commit1a6eab7fdda1cb85b5657ae77ab553ea60136eee
tree94efe408e44a1cf13015fc56ac02543cc9838b20
parentd8e045e85472c17623951b079c0cb8ed20b0b6c3
mis-merge

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1400952 13f79535-47bb-0310-9956-ffa450edef68
modules/slotmem/mod_slotmem_shm.c