From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001
From: Andrzej Szeszo <aszeszo@gmail.com>
Date: Tue, 04 Jun 2013 12:32:37 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster

---
 .hgtags |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/.hgtags b/.hgtags
index 268e022..6cf0fc1 100644
--- a/.hgtags
+++ b/.hgtags
@@ -75,3 +75,5 @@
 85b43edad4d23a200505acff491583af40cb61fb s12-20.1
 95c29b5f89d200df5a4ed06408125483aa928bb4 s12-21
 dbd9d49e871726c93660a3a57e0b9c0e965322e4 s12-21.1
+035c88cfb44c1f4106c619fe01b11bdcbda580d1 s12-22
+a1701fc2793fb61803a3acf71447a9e23a28ba58 s12-23

--
Gitblit v1.9.3