summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2012-04-04 09:07:18 +1000
committerMichael Cahill <michael.cahill@wiredtiger.com>2012-04-04 09:07:18 +1000
commit4690f8356bb1a8b9279fbe1034b724dec3169021 (patch)
tree09291ab7e935c114dfda12d89fa20c12949bcfc7
parentc9866b389f572378b9d2509eeca7dfd97a25d7a7 (diff)
parentd40564195ecb9f19c72e510b4c8f9c79a5710eea (diff)
downloadmongo-4690f8356bb1a8b9279fbe1034b724dec3169021.tar.gz
Merge branch 'master' into develop
-rw-r--r--.hgtags1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgtags b/.hgtags
index a55effa0f9a..9829e6b3469 100644
--- a/.hgtags
+++ b/.hgtags
@@ -4,3 +4,4 @@
0000000000000000000000000000000000000000 release-1.0
98e12f19a801998ff8afe1762116a141f1487b1f 1.1.0
349c43bd3bf439fb64bcb481bb8651a655edc471 1.1.1
+a792d468bedd7b37be9cfff545582ae8ff54ff6f 1.1.3