Merge remote-tracking branch 'XTUPLE/4_7_x' into popup-styling
authorLinda Nichols <lynnaloo@gmail.com>
Thu, 28 Aug 2014 17:56:36 +0000 (17:56 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Thu, 28 Aug 2014 17:56:36 +0000 (17:56 +0000)

Trivial merge