[wxsqlite3/f20] (13 commits) ...<<<<<<< HEAD

[Martin Gansser]

Summary of changes:

  ad306db... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass (*)
  2f4437e... update to 3.1.1 (*)
  82879cd... update to 3.1.1 (*)
  5601cd9... update to 3.1.1 (*)
  e7bba3d... update to 3.1.1 (*)
  c255689... added absolute path for wx-config (*)
  a027b9a... update to 3.1.1 (*)
  073d04f... update to 3.1.1 (*)
  aa9b856... - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_M (*)
  52f4ae1... update to 3.2.0 (*)
  41a3518... update to 3.2.0 (*)
  004f1df... update to 3.2.0 (*)
  274c526... <<<<<<< HEAD

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