Merge remote-tracking branch 'origin/master' # Conflicts: # juneau-core/src/main/java/org/apache/juneau/annotation/Pojo.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-juneau/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-juneau/commit/6a673967 Tree: http://git-wip-us.apache.org/repos/asf/incubator-juneau/tree/6a673967 Diff: http://git-wip-us.apache.org/repos/asf/incubator-juneau/diff/6a673967 Branch: refs/heads/master Commit: 6a6739678d01cf93f844cae04e4a218e3c069251 Parents: 490038f 3e1a668 Author: jamesbognar <[email protected]> Authored: Sat Aug 27 12:28:13 2016 -0400 Committer: jamesbognar <[email protected]> Committed: Sat Aug 27 12:28:13 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------
