Merge pull request #1904 from xtuple/4_7_x 4_8_x
authorSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 21:09:28 +0000 (17:09 -0400)
committerSteve Hackbarth <stephenhackbarth@gmail.com>
Fri, 3 Oct 2014 21:09:28 +0000 (17:09 -0400)
commitcc394953d8fc535c9d8395f1b84f219c24e86801
treea8ac43f25ece62c73a6ac4a547ea5e5a823ba499
parent4c9d894d9f8bf4d3f2d0457288c596c50bdb5f8f
parentc7edd949848ca2dc8cda5bc0994b414ddccf183c
Merge pull request #1904 from xtuple/4_7_x

merge forward 4_7_x into 4_8_x