Index: standard/src/main/webapp/WEB-INF/struts-config.xml
===================================================================
--- standard/src/main/webapp/WEB-INF/struts-config.xml	(revision 4108)
+++ standard/src/main/webapp/WEB-INF/struts-config.xml	(working copy)
@@ -54,6 +54,8 @@
                    type="com.xpn.xwiki.web.ObjectRemoveForm"/>
         <form-bean name="admin"
                    type="com.xpn.xwiki.web.EditForm"/>
+        <form-bean name="deleteversions"
+                   type="com.xpn.xwiki.web.DeleteVersionsForm"/>
     </form-beans>
 
     <!-- ========== Global Forward Definitions ============================== -->
@@ -147,6 +149,12 @@
             <forward name="edit" path="/templates/rollback.vm"/>
             <forward name="rollback" path="/templates/rollback.vm"/>
         </action>
+        
+        <action path="/deleteversions/"
+                type="com.xpn.xwiki.web.DeleteVersionsAction"
+                name="deleteversions"
+                scope="request">
+        </action>
 
         <action path="/cancel/"
                 type="com.xpn.xwiki.web.CancelAction"
Index: standard/src/main/webapp/skins/albatross/historyinline.vm
===================================================================
--- standard/src/main/webapp/skins/albatross/historyinline.vm	(revision 4108)
+++ standard/src/main/webapp/skins/albatross/historyinline.vm	(working copy)
@@ -1,6 +1,7 @@
 <div id="historycontent" class="xwikiintracontent">
 #if($inline && ($inline == true))    <div class="xwikititlewrapper" onclick="toggleClass($('history'), 'hidden'); toggleClass($('historycontent'), 'exp')"><h3 class="xwikiintratitle">$msg.get("history")</h3></div>#end
-    <form action="$doc.getURL("view", "viewer=changes&amp;$docvariant")" method="post">
+    <form id="history" action="$doc.getURL("view", "viewer=changes&amp;$docvariant")" method="post">
+      #set($formname="history")
       <div id="history">
       <div class="centered">
       <table class="xwikidatatable" summary="$msg.get(document) ${doc.displayTitle} &mdash; $msg.get("history")">
@@ -20,38 +21,52 @@
 #if(!$revisionscount)
 #set($revisionscount = 0)
 #end
+#set($skipnext = false)
+#set($versionshown = 0)
 #if ($tdoc.realLanguage!="")
 #set($lang = "&amp;language=${tdoc.realLanguage}")
 #else
 #set($lang = "")
 #end
 #foreach ($version in $tdoc.getRecentRevisions($revisionscount))
-#set($origdoc = "")
-#set($newdoc = "")
 #set($nextversion = $version)
-#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
-        <tr class="row#if($velocityCount % 2 == 1) even #else odd #end">
+#set($revinfo = $tdoc.getRevisionInfo($nextversion))
+#if($xwiki.hasMinorEdit() && (!$request.getParameter("showminor")))
+  #set($skipcur = $skipnext)
+  #set($skipnext = $revinfo.isMinorEdit())
+#end
+#if(!$skipcur)
+  #set($versionshown = $versionshown + 1)
+        <tr class="row#if($versionshown % 2 == 1) even #else odd #end">
           <td><input type="radio" name="rev1" value="$nextversion" /></td>
           <td><input type="radio" name="rev2" value="$nextversion" /></td>
           <td><a href="$tdoc.getURL("viewrev","rev=$nextversion")">$nextversion</a></td>
-#if($newdoc=="")
-          <td>&ndash;</td>
-          <td>&ndash;</td>
-#else
-          <td>$xwiki.getLocalUserName($newdoc.author)</td>
-          <td>$xwiki.formatDate($newdoc.date, "dd/MM/yyyy hh:mm")</td>
-#end
+          <td>$xwiki.getLocalUserName($revinfo.author)</td>
+          <td>$xwiki.formatDate($revinfo.date, "dd/MM/yyyy hh:mm")</td>
 #if($xwiki.hasEditComment())
-          <td>$!{newdoc.comment}</td>
+          <td>$!{revinfo.comment}</td>
 #end
 #if($hasedit || $hasadmin)
           <td class="xwikibuttonlink"><a href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if (confirm('$msg.get("readytorollback") $nextversion')){this.href += '&amp;confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
 #end
         </tr>
 #end
+#end
 </table>
-      <div class="buttons"><div class="buttonwrapper"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div></div>
+      <div class="buttons">
+        <div class="buttonwrapper"><input type="submit" accesskey="c" value="$msg.get("compare")" class="button"/></div>
+        #if($hasadmin)
+          <div class="buttonwrapper"><input class="button" type="submit" name="deleteversions" value="$msg.get("core.versions.delete")" onclick="if (confirm('$msg.get("core.versions.delete.confirm")')) { document.forms.${formname}.action='$doc.getURL("deleteversions", "$!{param}&confirm=1")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit(); return true; } return false;" /></div>
+        #end
+        #if($xwiki.hasMinorEdit())
+          #if(!$request.getParameter("showminor"))
+            <div class="buttonwrapper"><a href="$tdoc.getURL("view","viewer=history&amp;showminor=1&amp;$docvariant")">$msg.get("core.minoredit.show")</a></div>
+          #else
+            <div class="buttonwrapper"><a href="$tdoc.getURL("view","viewer=history&amp;$docvariant")">$msg.get("core.minoredit.hide")</a></div>
+          #end
+        #end
       </div>
+      </div>
     </div>
   </form>
   </div>