Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 7 insertions, 0 deletions

diff --git a/includes/exception/TimestampException.php b/includes/exception/TimestampException.php
new file mode 100644
index 00000000..b9c0c35c
--- /dev/null
+++ b/includes/exception/TimestampException.php
@@ -0,0 +1,7 @@
+<?php
+
+/**
+ * @since 1.20
+ */
+class TimestampException extends MWException {
+}