Merge from 1.0.x
authorEvan Prodromou <evan@status.net>
Thu, 8 Mar 2012 12:57:54 +0000 (06:57 -0600)
committerEvan Prodromou <evan@status.net>
Thu, 8 Mar 2012 12:57:54 +0000 (06:57 -0600)
commiteb6b4628b95f1bb770b01df86eacab756f28364b
treebb91240856f9ca0e6ddb5b9cc23238586929116d
parenta18d3facf8767419e699adefcfea2081c220185f
parenta4bf33d6b5f40e1e6f7a16c698c840301d085ddf
Merge from 1.0.x
lib/framework.php