State of staging branch?

[David Kastrup]

Hi all,

since yesterday it would appear that staging is stuck at a merge with
translation:

* commit 237cfd956ed0a705b379513fd861867a9671ce44 (origin/translation, 
origin/staging)
| Author:     Jean-Charles Malahieude <address@hidden>
| AuthorDate: Sat May 7 15:23:53 2016 +0200
| Commit:     Jean-Charles Malahieude <address@hidden>
| CommitDate: Sat May 7 15:23:53 2016 +0200
| 
|     Doc: update translation status
|    
*   commit 6316d6cdcc9ca46c2b72ecb5ff8cce92b5f38305
|\  Merge: 065ce43 3178552
| | Author:     Jean-Charles Malahieude <address@hidden>
| | AuthorDate: Sat May 7 15:21:29 2016 +0200
| | Commit:     Jean-Charles Malahieude <address@hidden>
| | CommitDate: Sat May 7 15:21:29 2016 +0200
| | 
| |     Merge branch 'master' into translation
| |   
| * commit 317855213ec27520789106310b58d67e116457e6 (origin/master, origin/HEAD)
| | Author:     Federico Bruni <address@hidden>
| | AuthorDate: Thu Apr 28 17:11:07 2016 +0200
| | Commit:     Federico Bruni <address@hidden>
| | CommitDate: Thu May 5 12:17:14 2016 +0200
| | 
| |     issue 4829: add all languages for content negotiation in .htaccess
| |     
| |     Improve also the instructions in the CG manual on debugging the
| |     website locally.
| |   

[...]

So what's up here?  Are no automated Patchy-staging instances running
now (I'll start one myself presently but it won't finish before an hour
or so I guess)?  Or is there a problem with current staging (what I
suspect)?  If so, any ideas what the problem might be?

-- 
David Kastrup