Merge commit 'mainstream/master'

Conflicts:

	actionmailer/lib/action_mailer/base.rb

1 files changed, 1 insertions, 1 deletions

diff --git a/pushgems.rb b/pushgems.rb
index 6a1f1ffe8f..784aa5de68 100755
--- a/pushgems.rb
+++ b/pushgems.rb
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 unless ARGV.first == "no_build"
-  build_number = build_number = `svn log -q -rhead http://dev.rubyonrails.org/svn/rails`.scan(/r([0-9]*)/).first.first.to_i
+  build_number = Time.now.strftime("%Y%m%d%H%M%S").to_i
 end
 
 %w( activeresource actionmailer actionpack activerecord railties activesupport ).each do |pkg|