Blocked revisions 420b4aed0149a860fc9e29cab3af1824af773af0 via svnmerge
Merged revisions b6ae3f3a321683c33adb43870014980bc383ae7a...e0ea14b3b66f920ebd1301fb65d5b6de516b9d50,caa2364ee8ea6070623b4872e40605d336198d3e...1a52996c5ae5bf1f3fc124d0f9be932d8ed415ff,d8a347f525a4234642e9e057535088ecf99ab268...fb69e8b264721fedb6d09a458d96e77a66fdf53d,abda10991e5d7f456ed5dd999fd331818fe4df59...b296c8d372a82c4326a6daac95b620fe9c3cd9f3,fefdfb9089368014db8e9df1e6d1c2982e512ba6,f347a1214bb819ae25de92decac0441e9d70bfa7...1a897a98082dca480ddff35f004be85a533e316a,8fc023ce9c12bd957c30d6cdc223d9ef47e1178c...f96291d3c1018bca764f56ee0da2dc779a1f6b54,86184a283e3e1f08cf9d018fb0025b626ca02ca3...56709c57b6a82b5c22e057f4b54a48092f04fa13 via svnmerge from 
https://svn.agavi.org/branches/1.0
Merged revisions d9dc2149f065eae450eb57c4f56ba44765c252b3,3b4164860212d13aac4c656fdf4e25b972029e67 via svnmerge from 
https://svn.agavi.org/branches/1.0
Merged revisions ed75477e83e125c6b7d10b5f19efb6bd510c54ba,65c114f05704158919abda58b1c9c04bd0b3f0d0...26fe07f5cd6e4138fffdaa3e1709c685f1af2828,54cc8978a5d2b470299c01b4356d32ae6d4374b0...a933cb887df3406d47eea1c6a06876ab9adcb697,6acda2c3654458947eb4072f487a6c49a9666095...a363b073504538778e8fda8ef9dafccfd449bad0,5401887be3e0831b089b62e5bbd9413b96792ead,488a0af1fa29951022801f0c67c80d933a3583fd...1cad51b9284b01fb74db0d91d6c87f7d071d7327,82970dca56f64dd350d70cbe95173c7682bfd96f...ae22f6b32cec9101f57f5ff2493cc1f86c47ffea via svnmerge from 
https://svn.agavi.org/branches/1.0
Merged revisions 7553fc530936d62673290610c10d7c3eee74d18d,0710110fafc5fa6e403033365a7cd29d716dc821...f0154817a5394fc05818ee548ee0ec676fade2d8,1069fd8d3e56daa63ec0785d4a78cdbf1b35331d...b3ed3ae36fc18080329d3f95ed48464106f1e482 via svnmerge from 
https://svn.agavi.org/branches/1.0
Merged revisions d9182562b98ea301d84a139db1ddcb451291c7e1...9566a6dd6b83a02fc113ee696bbe0faeedc5485a,9a1068e8e90af687a6e7477cd735d194fb143476,20dc5f25d3de85c2aea9f7a434f3d923a337a74c...95b8344dd5654532b2aa3942df7c466efdea3c89,fab6465b0203ff8f8ccff2263b162b3feea59185...48efd97083c134495792a96487cb1d05f8d91989,6bae5dce88b0c9427a7e9a73dbb25bdf5d754a5a...73defed82a6fb727742a08ecb385f23e5e4e0ef8,f3304e38e368637b7c6216986ebc4d4f05255e63,dc005ff855cc9a25f21495e7225cbe9d568c756c...36aadda8e93747a6a25c73bf223858c4e12d54a0,2758a739477ea0309267d983b387e18ad50bda53...9097e337703932c3f2f120d5649eecab8d278bf3,f3a9793cf7dc52a3162ebac01f52aa682a72143a...048f31f49c38bb7150f8bbb6c93b9eee7f868c63,219b6afc9f9f37a189425dd3c59fd56a58fb5568...55aaa7b95209981d17d002899179592e14b92502,3152ef266f390c16236b1c06eb03f030ac69b6ea...9a3eb0bbd01f8a3aaffd9ec2030c6749e051ef51,f36be3db8c8cf419625993be72e4a580bd599501...963dd66105c26813f2173f81fec23663ea06bbad,55b695516ec3cbcb4d14add892820c1cfb07a0fb...ba481fa298bfc3f55a375776f01b4f910cde7b78,7bd641dfafa4a70ddc37a61a15ea63ffb7074e9f...23c669a2544c407d3eafeb6407a97485c403c234,5a22d61be3c07010c2cd4b593d89e9485979c342,b2690b0bd7abec6958cbd9317d5d69853a68ff8e...0dc64a86b6303729e1f485d359b572d5681bd36a,a76737a3437176435b5525243ab01ed544fd4819...279090986cc9b952269d2f6da8a05091ec7d2adf,5b6f96f6c5b8ec7555baef0eebcfdcf4bb1b68f6...f40872ff2517b511a6d0b537a077b5c0e7da24dd,9d67de3ed37a28f62b79187955187f0c6911401e,87495d44083551eaaeb0db7dd1b8e5280d11a8b9...bbc2f48670cebf0aad2ecd41d37de74fa830b715,ebf62a6b975baba38caba77b0cf4b49df6c0a214...3f6cf3b2bcab6a1753334369670f54cf7ff28a88,1a67301e63f028a6fa67950ab21ed9edce1d88aa,f4ce9c9901c0ba5e3edca5c04653c9fd53e4afd7...0528e2cce436563f21a3dc0e0bab72f815fe2d4a,7f5b235d0b53addd9186bcae6470bfcee3396c4a...a8b9e9f61df17e31d4bfebac01eda7b8ce8c09ee,aecdac052df05246a74b0a2bb4c161919e69f8cb...915b43901dc3e57c88d626657b84ee25d4dde919,e054a497c0fb2b2a7584f80a40144ac68d9db44c...204e49e578dea1a3840521e64a229cadaa8c3366,a30fbd9d5fe034499fc3dafb95f6e8da1fba2486...6427cf1ea12df4050bbb97493a90d4d0513f548c,acf1cee70e06261dc4a41f727c4217543c003a31...97f77d312653a5499a814cac024b12f036acfc9f,91cfe0daa8dca94d6d9a440aab1d3487f397503d,352d7549cc3d2ec2a1e0743651366cffe659e9cc...5daa0c7c11309094941d875c0f398061244053c6,10a121786e6a217e83d45c43d566e2ace29865a7...2fac8e4f50125a685aa39e06b676bbe5c2384d9a,1b2c8ab4384ddc3fb70e2560d90c824fcb4c0983,724c75aee0d397c66f212dc239c489d87b41ff57,2ff54e84b3c799d027d4d2a6c9215d2f8ab2d87e...fa2f2cd49c457b05d362fb6c31de52c45846c26b,a519b00c96e39026e61c7183061b32c1cc7a62bd...c39b4153809553be6f4ccb38fe355de434b591fe,b4b05a985078e33d62e9a77d745e01145382630b,49ca36cb8909d077d5da67d089031863a6408f26...c2654aa351236e974e43a6837a3f9a1838240f43,d84f5e365e45d4d077d81a0c756b2acb01a304b2...37b59588731a696300599b7ef6540af0e3725533,a6ca98012a5697c6e7495da1fa26780817305dd8,8e63c8e31180e505e86055203b9552ca3a2b48ee,fdb660434a002ddf2053889457e496c8b94144c0,694afd222dc9e75f8264df2b7fafbae1784f8058,80439640a99d557e92f8658f994d41bbcfb9e813,94bf88b3df23f790beac18ed64a5a35b5d6e7870,cb0c939bdd968e4bbe821a12cd7c16e2a8da797d,c647135c295bb983f5517bc1188c41363f84e1b4,c4af9fd7ea0cccbea5656b92bcf0fb8ef7fdb36e,72796c77f51b73df637918c36a35de56f752ce21,795ed1af0e9bf0fae362c90f6b1adf4ea168387e,783d121e7ea288fbfc087bee124ace11c38f0680,caa25fddfa4fd3dd0aed021f995e9b63a9957ecc...b70a225b9f71e460bb502b37316737c5e16890d4,225232c39b596ad429445ab7b6775015384d0eb7...ced70d307027cb42106dd13549ead77c471c65b7,df9e5a2ae82f34ffd38b1ae8787e82c330ed509d...2fba9e2cbcd10990f299a4670e57b7a115a73e58,e5fbda80c87bf4c40e1c3b2bd444a5cbd59727fd,b8aa1731a5e0aed4c90edf9e532d97d543a8b8f5...dc520740f933131ef59661f8b0819bc8dee1635f,d8c5e1fb86e5198bd6c2b8f70a9bc48dc7b47858,91cadea4f7551fe3f75e42fa51269e711933557b,1f04918e87b9684dd0d139c58d57daaa0c0ecaef...97b6caf02b90e7547661484a235838c4c6e26681,16826352314a2eaa7812b8ad81dc47c2f9a7ec7c...c6d00e2d8c526b276823fc0d30d3e0f0d1a1135b,ce228848a69a06daafea8fe12651b50cf7838994,2531d9f0a39750af6772903dfe08e3b05c449f84...8c35595fdd94bf09d01963d78845167b61cb2255,178750d8a3ea07f7a8aaf7809e0fe833789d0b91,e0be4e573534ecf73eb3b814742a940bf765c3ad...3becd2394029518bab71897e4dd64072b1178486,ce17bd1c99f5f5513e016fb69e8a34bb5050299d,8df85b2dcbc9151cd9b7208056f1d1be2e04840b...76bb93c0460336fe508d80e9e11225740fbd6d25,bf1f260e3e635e7034413ce5e1d9e4ab43d74723...6fb2d21a6e8114ee95e85e46c452bf5723ca681f,0f0c3fef868e5ca1e51c8ab0931b8e653a93d027...40c9c9cc6c0e6581bcb5e2da499cbea3a33b1b49,bc6d5dfef81869ab4b33bfdba2b75f779ca68034...6db3e016f0a337c353cf812d2e991f721d4209ad,c1ed3a389d0d0b7f15d4bac84ee22ab4a5849db4...657007949baf8c6e6e98c6e0c29af37f8beccc4e,0dc8c0e5334fdf292c9164804e09bc812d01e8d5 via svnmerge from 
https://svn.agavi.org/branches/1.0
removed the version pin from the phpunit external
uninitializing branch, preparing for merge from trunk and rebasing to trunk/1.1
pulling branch up to current trunk state
removing the svnmerge integrated property
Initialized merge tracking via "svnmerge" with revisions 9b04db3a513ba6916db951778b1722e94588ff93...426929cbe816e7c8021d67eb05ddc4eeea600828 from 
https://svn.agavi.org/trunk
adds cache clearing before running the first test
refs #380
add proper template rendering, 
prerequisite for optional context/environment for subprocesses
prerequisite for optional cache clearing for subprocesses
refs #380
adds an option to clear the cache in the isolated environment
refs #380
adds an option to change the default context in the isolated environment
refs #380
adds annotation support for setting the testing environment using @AgaviIsolationEnvironment either at the testcase level at the test method level
refs #380
adds annotation support for setting the testing default context using @AgaviIsolationDefaultContext either at the testcase level or at the test method level
refs #380
adds annotation support for clearing the cache in isolated tests using @AgaviClearIsolationCache either at the testcase level or at the test method level
refs #380
annotations start with a small letter
refs #380
adds a way to set the factory info, refs #380