Merge branch '3.0/release/3.0.12' into 3.0/masterv3.0.12
commit19c562b1bc7f090d7a5a6b6c83c1f3dede57aed1
authorJeremy Bush <contractfrombelow@gmail.com>
Sun, 24 Jul 2011 23:45:42 +0000 (24 18:45 -0500)
committerJeremy Bush <contractfrombelow@gmail.com>
Sun, 24 Jul 2011 23:45:42 +0000 (24 18:45 -0500)
tree3f7278e1c110b3b39be8f6a616e8e3fd997f5ae0
parent92c9ae521f7aa108833dcebe440c59c6a287d8dc
parent3fe58e923c39bd963346e2b521fb648f169e97d7
Merge branch '3.0/release/3.0.12' into 3.0/master