merged back the RC branch

Conflicts:
	changelog.html
This commit is contained in:
Kohsuke Kawaguchi committed 2011-10-09 17:05:07 -07:00
commit 951d169d93
3 files changed
+11 -2

No files matched your search

@@ -49,7 +49,7 @@ import hudson.model.User;
* </pre>
*
* @author Erik Ramfelt
* @since 1.433
* @since 1.434
*/
public abstract class UserAvatarResolver implements ExtensionPoint {