Richard Peter 7775ed3e03 Issue #2214: Fix merge issue with gfe-spring.xml ... Former-commit-id: e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly e5cb3f9e0a [formerly 2064be203d] [formerly eb8805e51c] [formerly dad1b6fb45 [formerly eb8805e51c [formerly 346de47492d79ea1a2605fa3a02bc5058f2b8e9e]]]] Former-commit-id: dad1b6fb45 Former-commit-id: 24f8756c64 [formerly bbe1002d2d] [formerly cb3e15e4ac897a4a2e865c445de30e1e35aa445f [formerly c799d73430]] Former-commit-id: 30a7e16fcc217a4db3ce6d7a8d94a5a6e0494a27 [formerly b09a191bfc] Former-commit-id: c27aa3bd98		2013-08-14 18:32:39 -05:00
..
gfe-common.xml	Issue #2044 Refactor of GFE Server code	2013-07-25 13:05:56 -05:00
gfe-request.xml	Issue #2044 Refactor of GFE Server code	2013-07-25 13:05:56 -05:00
gfe-spring.xml	Issue #2214: Fix merge issue with gfe-spring.xml	2013-08-14 18:32:39 -05:00