Merge branch 'QA_3_4'
commit7ac39c04c26394a8d7daa9ce8715f51dc359a61e
authorMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 7 Dec 2011 03:23:13 +0000 (7 08:53 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 7 Dec 2011 03:23:13 +0000 (7 08:53 +0530)
treeb679cd9a20ab1be975f75b2a444c001876bd3793
parentb9fbeecda46084e5ca271daa7efcee2edebfc50b
parent6e0a10494f6670b3e67d6fb219a96c8001dcea2c
Merge branch 'QA_3_4'

Conflicts:
libraries/Table.class.php
ChangeLog
libraries/Table.class.php