Merge "Add 'avoidhours' option to Language#formatTimePeriod"

diff --cc RELEASE-NOTES-1.34
index 786dae2,2b22d92..7738adb
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -39,10 -38,10 +39,11 @@@ For notes on 1.33.x and older releases
  * …
  
  === New developer features in 1.34 ===
- * …
+ * Language::formatTimePeriod now supports the new 'avoidhours' option to output
+   strings like "5 days ago" instead of "5 days 13 hours ago".
  
  === External library changes in 1.34 ===
 +
  ==== New external libraries ====
  * …
  

diff --cc languages/Language.php
Simple merge