| commit | d6850b8f0ec81951e8338d0b60684bc00305aaf1 | |
| author | Stephen Compall <scompall@nocandysw.com> | |
| Fri, 4 Sep 2009 18:37:24 +0000 (4 13:37 -0500) | ||
| committer | Stephen Compall <scompall@nocandysw.com> | |
| Fri, 4 Sep 2009 18:37:24 +0000 (4 13:37 -0500) | ||
| tree | 2af5ce4f74335b1cd8e5043222317bb04208091f | treesnapshot (tar.gz zip) |
| parent | 1c5a7b82d8f677df966618c58b0c8a0d77eb7310 | commitdiff |
| parent | 093a1b15dbdea1f10277414b964797c130719cce | commitdiff |
merge master (including some s11 patches)
Conflicts: restore `database-destroy' (accepted as spelling
correction, not API removal) and reorder MySQL includes and libs.
Conflicts: restore `database-destroy' (accepted as spelling
correction, not API removal) and reorder MySQL includes and libs.