Merge branch 'plugin-automation'
authorJeremy Carter <Jeremy@JeremyCarter.ca>
Tue, 11 Nov 2014 23:07:44 +0000 (18:07 -0500)
committerJeremy Carter <Jeremy@JeremyCarter.ca>
Tue, 11 Nov 2014 23:07:44 +0000 (18:07 -0500)
commit8eb18fdd76fb54447795b792df5adb3fa5746be5
treee9a9810240949ac9b6422b75b99eecfc7a6bb353
parentaa9dda2c6abd25fa8d6488c323ff213cacc526ca
parent7c263f3bc4f3bddd8094c9baecf584503012acc8
Merge branch 'plugin-automation'