Merge branch 'gilbert' into gilbert-1.3
authorStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 7 Apr 2011 17:14:35 +0000 (13:14 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Thu, 7 Apr 2011 17:14:35 +0000 (13:14 -0400)
commit1eb51a5b5ac85607af67275ff3684febd84406c9
treea00e77fd0a1b0bd61759a551ad1edef580e04b5c
parentfdf8e669733ebdd25c98afc11fcf95bcb79a5126
parent7e796853f50f6ea6d829b91bb05ebcfa4bb02822
Merge branch 'gilbert' into gilbert-1.3
contrib/gilbert/static/gilbert/plugins/models.js