Merge pull request #1264 from xtuple/1_7_x
authorshackbarth <stephenhackbarth@gmail.com>
Mon, 10 Feb 2014 20:19:05 +0000 (15:19 -0500)
committershackbarth <stephenhackbarth@gmail.com>
Mon, 10 Feb 2014 20:19:05 +0000 (15:19 -0500)
merge from 1.7.1


Trivial merge