scala/scala — pull request #3728 by retronym (2014-05-08 09:06:57+00:00)
Title: Merge process:

```
% export MB=$(git merge-base origin/2.10.x head)
% git log --graph --oneline --decorate $MB..origin/2.10.x
* ec05aeb (origin/2.10.x) Merge pull request #3678 from retronym/ticket/8479
|\
| * c4561c1 (retronym/ticket/8479, origin/pr/3678) SI-8479 Fix constructor default args under scaladoc
* c74e132 Merge pull request #3655 from retronym/ticket/8442
|\
| * 8262ed2 (retronym/ticket/8442, origin/pr/3655) SI-8442 Ignore stub annotation symbols in `AnnotationInfo#matches`
* 2af68ee Merge pull request #3551 from xeno-by/topic/typecheck-member-def
|\
| * 3314d76 (origin/pr/3551) [nomaster] typecheck(q"class C") no longer crashes
* 876590b Merge pull request #3614 from retronym/ticket/8196
* 540963f (retronym/ticket/8196, origin/pr/3614) SI-8195 Test case to show this is a dup of SI-8196
* 7b72f95 SI-8196 Runtime reflection robustness for STATIC impl details

% git merge 876590b

% git merge -sours 3314d76

% git merge ec05aeb
```

Conflicts resolved in `JavaMirrors`.