Merge branch 'master' into 21836a
authorJohn Rogelstad <john@xtuple.com>
Thu, 31 Oct 2013 14:17:34 +0000 (10:17 -0400)
committerJohn Rogelstad <john@xtuple.com>
Thu, 31 Oct 2013 14:17:34 +0000 (10:17 -0400)
commitd6ccad91763fc95fa787a9d33c0b89d7400d368d
tree13cf57f99e68b5824008b9c9629c1f5f5bf219c8
parentbc5bbbc8f752d48e77a958a2cd5e8795d587d81f
parent50561f3d31b93db9834fdf3eb6327ae4d1cfde0c
Merge branch 'master' into 21836a