Merge pull request #1195 from shackbarth/22394-merge
authorJohn Rogelstad <john@xtuple.com>
Sun, 12 Jan 2014 20:05:24 +0000 (12:05 -0800)
committerJohn Rogelstad <john@xtuple.com>
Sun, 12 Jan 2014 20:05:24 +0000 (12:05 -0800)
issue #22394: bring in context patch, and fix database to 4.2.1


Trivial merge