Merge branch 'master' into kronolith_4_2

horde · Nov 26, 2013 · a27361b · a27361b
2 parents b12876e + e857bf8
commit a27361b
Show file tree

Hide file tree

Showing 8 changed files with 317 additions and 94 deletions.
diff --git a/hermes/docs/CHANGES b/hermes/docs/CHANGES
@@ -2,6 +2,9 @@
 v2.0-git
 --------
 
+[mjr] Implement exclusive timers (Request #12543).
+[mjr] Add ability to optionally add client, cost object, or job type to timer
+      on creation.
 [mjr] Add listTimeObjects support.
 [mjr] Redesigned UI.
 [jan] Fix listing per-client cost objects in search form.