Merge remote-tracking branch 'upstream/master'

diff --cc src/php_swfed.h
index 86170e8,e1645f8..b0bb42a
--- 1/src/php_swfed.h
--- 2/src/php_swfed.h
+++ b/src/php_swfed.h
@@@ -24,7 -24,7 +24,11 @@@
  extern zend_module_entry swfed_module_entry;
  #define phpext_swfed_ptr &swfed_module_entry
  
++<<<<<<< HEAD
 +#define PHP_SWFED_VERSION "0.65a" /* Replace with version number for your extention */
++=======
+ #define PHP_SWFED_VERSION "1.01a" /* Replace with version number for your extention */
++>>>>>>> upstream/master
  
  #ifdef PHP_WIN32
  #define PHP_SWFED_API __declspec(dllexport)