removed note about not merging 2 frameworks
authorNicole C. Engard <nengard@gmail.com>
Thu, 2 Aug 2012 18:44:42 +0000 (14:44 -0400)
committerNicole C. Engard <nengard@gmail.com>
Thu, 2 Aug 2012 18:44:42 +0000 (14:44 -0400)
commitef2d1ef72029fd3f55778add24291fac1e9daa85
tree5101b2e8ef2d6a0b70d62286611a03a105fa307b
parent26758e608381ce5d73c5b7963db07f070d3ad916
removed note about not merging 2 frameworks
en/manual.xml