Merge branch 'master' into plugin_metadata
authorErich Smith <heartquest@gmail.com>
Fri, 11 May 2012 18:08:33 +0000 (14:08 -0400)
committerErich Smith <heartquest@gmail.com>
Fri, 11 May 2012 18:08:33 +0000 (14:08 -0400)
commit205027491a37f7d8cc986e988b8a852a15404f2a
tree606624661fd4d2d738182e4d7af338f855878001
parent3f8fe6157c9bcc804ac64d3845ac944b1446eaa4
parent54680bd83a64bb496498c6083d8d2ba37b2adb20
Merge branch 'master' into plugin_metadata