[armadillo/f15/master] (19 commits) ...Merge remote branch 'origin/el6/master'

[conrads]

Summary of changes:

  9609421... Initialize branch F-12 for armadillo (*)
  6fbe7b1... Fix typo that causes a failure to update the common directo (*)
  f1680af... Fix typo that causes a failure to update the common directo (*)
  7106140... Initialize branch F-13 for armadillo (*)
  448bb5a... update to 0.9.2 (*)
  b0ff38e... update to 0.9.2 (*)
  ad55e54... update to 0.9.2 (*)
  597e405... updates for Armadillo 0.9.52 (*)
  62cb992... updates for Armadillo 0.9.52 (*)
  26723c6... updates for Armadillo 0.9.52 (*)
  fc87864... Initialize branch EL-6 for armadillo (*)
  5db6a9f... dist-git conversion (*)
  3219aac... dist-git conversion (*)
  635df6e... dist-git conversion (*)
  e0eb879... Initial pseudo merge for dist-git setup (*)
  4d64440... Initial pseudo merge for dist-git setup (*)
  70f6c71... update to upstream 1.2.0 release (*)
  5bdc8f8... Merge remote branch 'origin/f14/master' (*)
  c3a4dea... Merge remote branch 'origin/el6/master' (*)

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