[vfrnav/f17] (7 commits) ...Merge remote-tracking branch 'origin/f18' into f17

[sailer]

Summary of changes:

  6004238... Merge remote-tracking branch 'origin/master' into f18 (*)
  d8bc215... Merge remote-tracking branch 'origin/master' into f18 (*)
  788bd52... Merge remote-tracking branch 'origin/master' into f18 (*)
  0a55dad... update to 20130627 (*)
  42b47ab... Merge remote-tracking branch 'origin/master' into f18 (*)
  1053074... fix up changelog (*)
  29d7ce6... Merge remote-tracking branch 'origin/f18' into f17

(*) This commit already existed in another branch; no separate mail sent