Merge branch 'master' into var-conds

* master:
  Add Tx.Return and a return value from Atomically
  Panic when trying to set a nil Var

# Conflicts:
#	funcs.go

1 files changed, 8 insertions, 0 deletions

diff --git a/tx.go b/tx.go
index d4f343a..5dd41ae 100644
--- a/tx.go
+++ b/tx.go
@@ -87,3 +87,11 @@ func (tx *Tx) Assert(p bool) {
 		tx.Retry()
 	}
 }
+
+func (tx *Tx) Return(v interface{}) {
+	panic(_return{v})
+}
+
+type _return struct {
+	value interface{}
+}