Merge remote-tracking branch 'XTUPLE/4_7_x' into popup-styling
authorLinda Nichols <lynnaloo@gmail.com>
Tue, 2 Sep 2014 14:38:45 +0000 (14:38 +0000)
committerLinda Nichols <lynnaloo@gmail.com>
Tue, 2 Sep 2014 14:38:45 +0000 (14:38 +0000)

Trivial merge