Merge remote-tracking branch 'coss/hotfix/abstract-controller'
authorRob Allen <rob@akrabat.com>
Sat, 30 Jun 2012 19:34:57 +0000 (20:34 +0100)
committerRob Allen <rob@akrabat.com>
Sat, 30 Jun 2012 19:34:57 +0000 (20:34 +0100)
commita356134a7b457fc029f5344119e0e1f58607034c
tree68576233194f169eac7444a54b220903ae524775
parent801c8e68a774c9a10881c457d300d93cf9071d85
parentb1ed9cf58083c48409f4d33923657eb8dc0ec70d
Merge remote-tracking branch 'coss/hotfix/abstract-controller'