tree 69d9063c0615f338ae5679315b0f342164caa5ef
parent 103f279ce4a4a756e9d94b36cabbc3bb8b4e13f0
parent 9c0247a0537cc6aa0d00eedc96be766e5038b554
author David Pursehouse <david.pursehouse@sonymobile.com> 1404467494 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> 1404467494 +0900

Merge branch 'stable-1.7'

* stable-1.7:
  gwtorm 1.7.3
  Only bind LIMIT variable in SQL when dialect supports it
  Start 1.7.3 development
  gwtorm 1.7.2
  Make rollback() and commit() no ops when no transaction is active
  Fix conditional unit test skipping
  Start 1.7.2

Conflicts:
	pom.xml

Change-Id: Iefbfa04cfdcc399bf083a2bea4d0e7dc8c3b3447