Merge remote-tracking branch 'weierophinney/hotfix/event-manager-shared'
authorEvan Coury <me@evancoury.com>
Mon, 23 Apr 2012 20:17:22 +0000 (13:17 -0700)
committerEvan Coury <me@evancoury.com>
Mon, 23 Apr 2012 20:17:22 +0000 (13:17 -0700)
commit76eb64754b795c5062373988a19cfdd46a47a4a7
tree447e0ee4baa9f1b0f9c2207db75520397482e4de
parentd1ddb54dca0b57a721c0135b1285480c25595630
parent632641e8865dd6318ccbadd300961550e2e017cf
Merge remote-tracking branch 'weierophinney/hotfix/event-manager-shared'
public/index.php